xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

皮肤：周边相关功能影响

Browse Source
This commit is contained in:
luying
2021-10-19 14:24:05 +08:00
parent da5a43abba
commit 864f856c1c
16 changed files with 254 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
game-server/app/servers/battle/handler/expeditionBattleHandler.ts
View File

@@ -140,7 +140,7 @@ export class ExpeditionBattleHandler {
if (!preBattle) return resResult(STATUS.BATTLE_NEED_PREVIOUS_GK);
}
let { isOK, heroes } = await checkBattleHeroes(roleId, seqIds);
let { isOK, hids } = await checkBattleHeroes(roleId, seqIds);
if (!isOK) return resResult(STATUS.BATTLE_HERO_NOT_FOUND);
let expeditionWarRecord = await ExpeditionWarRecordModel.getRecordByCodeAndId(expeditionCode, expeditionId);
@@ -158,7 +158,7 @@ export class ExpeditionBattleHandler {
status: 0,
warName: warInfo.gk_name,
warType: warInfo.warType,
record: { heroes, seqIds }
record: { heroes: hids, seqIds }
}
}, true);

6
game-server/app/servers/battle/handler/normalBattleHandler.ts
View File

@@ -58,7 +58,7 @@ export class NormalBattleHandler {
if (preBattle == -1) return resResult(STATUS.BATTLE_NEED_PREVIOUS_GK);
}
let { isOK, heroes, lineup } = await checkBattleHeroes(roleId, seqIds);
let { isOK, hids, lineup } = await checkBattleHeroes(roleId, seqIds);
if (!isOK) return resResult(STATUS.BATTLE_HERO_NOT_FOUND);
const battleCode = genCode(8); // 关卡唯一值
@@ -72,7 +72,7 @@ export class NormalBattleHandler {
}
dailyNum = Object.assign(dailyNum, checkResult.data);
} else if (warInfo.warType == WAR_TYPE.TOWER) {
let checkResult = await checkTowerWar(roleId, battleId, seqIds, heroes);
let checkResult = await checkTowerWar(roleId, battleId, seqIds, hids);
if (checkResult.status == -1) {
return checkResult.resResult
}
@@ -98,7 +98,7 @@ export class NormalBattleHandler {
status: 0,
warName: warInfo.gk_name,
warType: warInfo.warType,
record: { heroes, seqIds, lineup }
record: { heroes: hids, seqIds, lineup }
}
}, true);

143
game-server/app/servers/battle/handler/pvpHandler.ts
View File

@@ -34,73 +34,6 @@ export class PvpHandler {
constructor(private app: Application) {
}
async addRoleScore(msg: { heroScores: Array<{ hid: number, score: number }> }, session: BackendSession) {
let { heroScores: addHeroScores } = msg;
let roleId = session.get('roleId');
let sid = session.get('sid');
let { heroScores, hisScore } = await PvpDefenseModel.findByRoleId(roleId);
let score = 0;
for (let { hid, score: heroScore } of addHeroScores) {
if (heroScore < 0) continue;
let index = findIndex(heroScores, { hid });
if (index != -1) {
heroScores[index].score = heroScore;
} else {
heroScores.push({ hid, score: heroScore });
}
}
for (let heroScore of heroScores) {
score += heroScore.score;
}
if (score < 0) {
score = 0;
}
if (hisScore < score) {
hisScore = score;
}
let pLv = getPLvByScore(score);
let pvpDefense = await PvpDefenseModel.updateInfoAndInclude(roleId, { score, hisScore, pLv, heroScores });
let roleName = session.get('roleName');
const role = await RoleModel.findByRoleId(roleId);
// 加入排行榜
let r = new Rank(REDIS_KEY.PVP_RANK, {});
await r.setRankWithRoleInfo(roleId, pvpDefense.score, pvpDefense.updatedAt.getTime(), role);
// 任务
await checkTask(roleId, sid, TASK_TYPE.PVP_HERO_SCORE, 0, false, { heroScores });
return resResult(STATUS.SUCCESS, { score, hisScore, heroScores });
}
async debugPvpSeasonReset(msg: {}, session: BackendSession) {
await pvpSeasonEnd({ name: 'exce setPvpSeasonResult debug' });
let systemConfig = await createNextPvpSeason();
return resResult(STATUS.SUCCESS, { seasonNum: systemConfig.seasonNum, seasonEndTime: systemConfig.seasonEndTime })
}
async debugPvpWarReset(msg: {}, session: BackendSession) {
let systemConfig = await resetPvpWarId();
return resResult(STATUS.SUCCESS, { systemConfig });
}
async debugPvpSeasonResetTime(msg: { day: number }, session: BackendSession) {
let { day: hour } = msg;
let { seasonNum, seasonEndTime } = await pinus.app.rpc.systimer.systimerRemote.resetPvpSeasonTime.toServer('systimer-server-1', hour);
return resResult(STATUS.SUCCESS, { seasonNum, seasonEndTime });
}
async debugAddChallengeCnt(msg: { challengeCnt: number }, session: BackendSession) {
let { challengeCnt } = msg;
let roleId = session.get('roleId');
if (challengeCnt > PVP.PVP_CHALLENGE_COUNTS) {
challengeCnt = PVP.PVP_CHALLENGE_COUNTS;
}
let { challengeRefTime } = await PvpDefenseModel.updateInfoAndInclude(roleId, { challengeCnt, challengeRefTime: nowSeconds(), refOppCnt: 0 });
return resResult(STATUS.SUCCESS, { challengeCnt, challengeRefTime });
}
//1获取主界面
async getData(msg: {}, session: BackendSession) {
let roleId = session.get('roleId');
@@ -383,7 +316,7 @@ export class PvpHandler {
let defIndex = findIndex(defHeros, { dataId });
if (defIndex == -1) {
defIndex = defHeros.length;
defHeros.push({ actorId: 0, order: 0, ce: 0, hero: null, dataId });
defHeros.push({ actorId: 0, skinId: 0, order: 0, ce: 0, hero: null, dataId });
}
if (index == -1) {
defHeros[defIndex].actorId = 0;
@@ -462,10 +395,10 @@ export class PvpHandler {
let role = await RoleModel.findByRoleId(oppoRoleId);
let heroes = new Array<PlayerDetailHero>();
for (let { hid, lv, star, colorStar, quality } of dbHeroes) {
for (let { hid, lv, star, colorStar, quality, skinId } of dbHeroes) {
let heroScore = pvpDefense.heroScores.find(cur => cur.hid == hid);
heroes.push({
actorId: hid, lv, star, colorStar, quality,
actorId: hid, lv, star, colorStar, quality, skinId,
score: heroScore ? heroScore.score : 0
});
}
@@ -511,4 +444,74 @@ export class PvpHandler {
let pvpRecords = await PvpRecordModel.getRecByRoleId(roleId);
return resResult(STATUS.SUCCESS, { list: pvpRecords });
}
// debug接口
async addRoleScore(msg: { heroScores: Array<{ hid: number, score: number }> }, session: BackendSession) {
let { heroScores: addHeroScores } = msg;
let roleId = session.get('roleId');
let sid = session.get('sid');
let { heroScores, hisScore } = await PvpDefenseModel.findByRoleId(roleId);
let score = 0;
for (let { hid, score: heroScore } of addHeroScores) {
if (heroScore < 0) continue;
let index = findIndex(heroScores, { hid });
if (index != -1) {
heroScores[index].score = heroScore;
} else {
heroScores.push({ hid, score: heroScore });
}
}
for (let heroScore of heroScores) {
score += heroScore.score;
}
if (score < 0) {
score = 0;
}
if (hisScore < score) {
hisScore = score;
}
let pLv = getPLvByScore(score);
let pvpDefense = await PvpDefenseModel.updateInfoAndInclude(roleId, { score, hisScore, pLv, heroScores });
let roleName = session.get('roleName');
const role = await RoleModel.findByRoleId(roleId);
// 加入排行榜
let r = new Rank(REDIS_KEY.PVP_RANK, {});
await r.setRankWithRoleInfo(roleId, pvpDefense.score, pvpDefense.updatedAt.getTime(), role);
// 任务
await checkTask(roleId, sid, TASK_TYPE.PVP_HERO_SCORE, 0, false, { heroScores });
return resResult(STATUS.SUCCESS, { score, hisScore, heroScores });
}
async debugPvpSeasonReset(msg: {}, session: BackendSession) {
await pvpSeasonEnd({ name: 'exce setPvpSeasonResult debug' });
let systemConfig = await createNextPvpSeason();
return resResult(STATUS.SUCCESS, { seasonNum: systemConfig.seasonNum, seasonEndTime: systemConfig.seasonEndTime })
}
async debugPvpWarReset(msg: {}, session: BackendSession) {
let systemConfig = await resetPvpWarId();
return resResult(STATUS.SUCCESS, { systemConfig });
}
async debugPvpSeasonResetTime(msg: { day: number }, session: BackendSession) {
let { day: hour } = msg;
let { seasonNum, seasonEndTime } = await pinus.app.rpc.systimer.systimerRemote.resetPvpSeasonTime.toServer('systimer-server-1', hour);
return resResult(STATUS.SUCCESS, { seasonNum, seasonEndTime });
}
async debugAddChallengeCnt(msg: { challengeCnt: number }, session: BackendSession) {
let { challengeCnt } = msg;
let roleId = session.get('roleId');
if (challengeCnt > PVP.PVP_CHALLENGE_COUNTS) {
challengeCnt = PVP.PVP_CHALLENGE_COUNTS;
}
let { challengeRefTime } = await PvpDefenseModel.updateInfoAndInclude(roleId, { challengeCnt, challengeRefTime: nowSeconds(), refOppCnt: 0 });
return resResult(STATUS.SUCCESS, { challengeCnt, challengeRefTime });
}
}

42
game-server/app/servers/battle/handler/towerBattleHandler.ts
View File

@@ -1,19 +1,17 @@
import { STATUS } from './../../../consts/statusCode';
import { HANG_UP_CONSTS, REDIS_KEY } from './../../../consts';
import { TowerTaskRecModel, TowerTaskRecType } from './../../../db/TowerTaskRec';
import { TaskHero, TowerTaskRecModel, TowerTaskRecType } from './../../../db/TowerTaskRec';
import { HangUpSpdUpRecModel } from './../../../db/HangUpSpdUpRec';
import { HangUpRecordModel } from './../../../db/HangUpRecord';
import { RoleModel } from './../../../db/Role';
import { TowerRecordModel } from './../../../db/TowerRecord';
import { Application, BackendSession } from 'pinus';
import { resResult, shouldRefresh, genCode } from '../../../pubUtils/util';
import { calcuHangUpReward, checkTaskConditions, checkHangUpSpdUpCnt, refreshTasks, treatTask, getRemainTime, getDoingOrWaitingTasks, getTowerStatus, getHungupRewards, getTasks, checkTaskRewards, getTowerTaskCostGold, getHangSpdUpCostGold, getManyHangSpdUpCostGold, getTaskStatus } from '../../../services/battleService';
import { resResult, genCode } from '../../../pubUtils/util';
import { calcuHangUpReward, checkHangUpSpdUpCnt, refreshTasks, treatTask, getRemainTime, getTowerStatus, getHungupRewards, getTasks, checkTaskRewards, getTowerTaskCostGold, getHangSpdUpCostGold, getManyHangSpdUpCostGold, getTaskStatus } from '../../../services/battleService';
import { addItems, handleCost } from '../../../services/rewardService';
import { checkBattleHeroes } from '../../../services/normalBattleService';
import { getGoldObject } from '../../../pubUtils/itemUtils';
import { Rank } from '../../../services/rankService';
import { gameData } from '../../../pubUtils/data';
import { ItemInter } from '../../../pubUtils/interface';
import * as dicParam from '../../../pubUtils/dicParam';
export default function(app: Application) {
@@ -154,7 +152,7 @@ export class TowerBattleHandler {
return resResult(STATUS.SUCCESS, { curTasks: treatTask(curTasks, curTime), costGold, nextCostGold, refRemainTime});
}
async sendTaskHero(msg: {batchCode: string, tasks: Array<{taskCode: string, heroes: Array<number>}>}, session: BackendSession) {
async sendTaskHero(msg: {batchCode: string, tasks: {taskCode: string, heroes: number[]}[]}, session: BackendSession) {
let roleId = session.get('roleId');
const curTime = new Date();
@@ -162,36 +160,44 @@ export class TowerBattleHandler {
if (!curTasks || curTasks.length == 0) {
return resResult(STATUS.TOWER_TASK_NOT_FOUND);
}
let usedHeroes = [], tasks = [];
const tasksCode = [];
let usedHeroes: number[] = [], tasks: {taskCode:string, heroes: TaskHero[], completeTime: number}[] = [];
const tasksCode: string[] = [];
const taskMap = new Map<string, any>()
curTasks.forEach(task => {
let getStatusResult = getTaskStatus(task.status, task.completeTime, curTime);
if(getStatusResult.status == 1) usedHeroes = usedHeroes.concat(task.heroes);
if(getStatusResult.status == 1) {
for(let { seqId } of task.heroes) {
usedHeroes.push(seqId);
}
}
tasksCode.push(task.taskCode);
taskMap.set(task.taskCode, task);
});
for (let task of msg.tasks) {
let curTask = taskMap.get(task.taskCode); // 数据库中，这个任务的数据
for (let { taskCode, heroes: seqIds } of msg.tasks) {
let curTask = taskMap.get(taskCode); // 数据库中，这个任务的数据
if(!curTask) {
return resResult(STATUS.TOWER_TASK_MISSING)
}
let taskInfo = gameData.towerTask.get(curTask.taskId);
if (task.heroes.length !== taskInfo.actorNeeded) { // 武将数，从策划表中读取
let dicTask = gameData.towerTask.get(curTask.taskId);
if (seqIds.length !== dicTask.actorNeeded) { // 武将数，从策划表中读取
return resResult(STATUS.TOWER_TASK_MAX_HERO);
}
let { isOK } = await checkBattleHeroes(roleId, task.heroes);
let { isOK, heroes } = await checkBattleHeroes(roleId, seqIds);
if(!isOK) return resResult(STATUS.BATTLE_HERO_NOT_FOUND);
if (tasksCode.indexOf(task.taskCode) === -1) {
if (tasksCode.indexOf(taskCode) === -1) {
return resResult(STATUS.TOWER_TASK_CODE_NOT_FOUND);
}
if (usedHeroes.length > 0) { // 是否在其他任务重使用了武将
let used = !!task.heroes.find(seqId => usedHeroes.indexOf(seqId) !== -1);
let used = !!seqIds.find(seqId => usedHeroes.indexOf(seqId) !== -1);
if (used) {
return resResult(STATUS.TOWER_TASK_HERO_HAS_USED);
}
}
tasks.push({...task, completeTime: taskInfo.completeTime})
let taskHeroes = heroes.map(hero => {
return new TaskHero(hero);
});
tasks.push({ taskCode, heroes: taskHeroes, completeTime: dicTask.completeTime})
}
const recs = await TowerTaskRecModel.sendHeroes(roleId, msg.batchCode, tasks, curTime,);
@@ -225,7 +231,7 @@ export class TowerBattleHandler {
if (!tasks || tasks.length == 0) {
return resResult(STATUS.TOWER_TASK_NOT_FOUND);
}
const checkResult = await checkTaskRewards(roleId, batchCode, tasks);
const checkResult = checkTaskRewards(batchCode, tasks);
if (!checkResult) {
return resResult(STATUS.TOWER_TASK_BATCH_NOT_FOUND);
}

8
game-server/app/servers/role/handler/friendHandler.ts
View File

@@ -668,9 +668,9 @@ export class FriendHandler {
for (let hid of showLineup) {
let curHero = dbHeroes.find(cur => cur.hid == hid);
if (curHero) {
let { lv, star, colorStar, quality } = curHero;
let { lv, star, colorStar, quality, skinId } = curHero;
heroes.push({
actorId: hid, lv, star, colorStar, quality,
actorId: hid, skinId, lv, star, colorStar, quality,
score: 0
});
}
@@ -679,9 +679,9 @@ export class FriendHandler {
for (let { hid } of topLineup) {
let curHero = dbHeroes.find(cur => cur.hid == hid);
if (curHero) {
let { lv, star, colorStar, quality } = curHero;
let { lv, star, colorStar, quality, skinId } = curHero;
heroes.push({
actorId: hid, lv, star, colorStar, quality,
actorId: hid, lv, skinId, star, colorStar, quality,
score: 0
});
}

34
game-server/app/services/battleService.ts
View File

@@ -7,7 +7,7 @@ import { RoleModel, RoleType } from './../db/Role';
import { shouldRefresh, resResult, cal, getRandEelmWithWeight, genCode, } from '../pubUtils/util';
import { STATUS } from '../consts/statusCode';
import { HangUpSpdUpRecModel } from '../db/HangUpSpdUpRec';
import { TowerTaskRecModel, TowerTaskRecType } from '../db/TowerTaskRec';
import { TaskHero, TowerTaskRecModel, TowerTaskRecType } from '../db/TowerTaskRec';
import { cloneDeep } from 'lodash';
import { Rank } from './rankService';
import { checkActivityTask, checkTask } from './taskService';
@@ -97,7 +97,7 @@ export async function getTasks(role: RoleType) {
const batchCode = genCode(8);
let preTasks = await TowerTaskRecModel.getPreTasks(roleId);
if(preTasks && preTasks.length) {
let checkResult = await checkTaskRewards(roleId, preTasks[0].batchCode, preTasks );
let checkResult = checkTaskRewards(preTasks[0].batchCode, preTasks );
if(!checkResult) return false;
await sendMailByContent(MAIL_TYPE.TOWER_TASK_REWARD, roleId, { goods: checkResult.rewards });
await TowerTaskRecModel.finishTask(preTasks[0].batchCode, preTasks.map(cur => cur.taskCode));
@@ -116,7 +116,7 @@ export async function getTasks(role: RoleType) {
return {curTasks: treatTask(curTasks, curTime), refRemainTime, nextCostGold}
}
export async function checkTaskRewards(roleId: string, batchCode: string, tasks: TowerTaskRecType[]) {
export function checkTaskRewards(batchCode: string, tasks: TowerTaskRecType[]) {
const curTime = new Date();
let compTasks: string[] = [];
let rewards: RewardInter[] = [];
@@ -128,7 +128,7 @@ export async function checkTaskRewards(roleId: string, batchCode: string, tasks:
compTasks.push(task.taskCode);
rewards.push(...reward);
if(termsForAdd) {
const result = await checkTaskConditions(roleId, task.heroes, termsForAdd);
const result = checkTaskConditions(task.heroes, termsForAdd);
if(result) {
rewards.push(...additionalReward);
}
@@ -356,33 +356,28 @@ export async function calcuHangUpReward(roleId: string, speedUp = false, speedUp
};
}
async function checkCond(roleId: string, heroes, type: number, param: number, cnt: number) {
function checkCond(heroes: TaskHero[], type: number, param: number, cnt: number) {
let heroCnt = 0;
switch (type) {
case 1:
for (let seqId of heroes) {
const { star, colorStar } = await HeroModel.findBySeqIdAndRole(seqId, roleId);
for (let { star, colorStar } of heroes) {
if (star + colorStar >= param) {
heroCnt++;
}
}
break;
case 2:
for (let seqId of heroes) {
let { hid } = await HeroModel.findBySeqIdAndRole(seqId, roleId);
const hInfo = gameData.hero.get(hid);
if (hInfo.camp === param) {
for (let { camp } of heroes) {
if (camp === param) {
heroCnt++;
}
}
break;
case 3:
for (let seqId of heroes) {
let { hid } = await HeroModel.findBySeqIdAndRole(seqId, roleId);
const hInfo = gameData.hero.get(hid);
if (gameData.job.get(hInfo.jobid).job_class === param) {
for (let { jobClass } of heroes) {
if (jobClass === param) {
heroCnt++;
}
}
@@ -396,11 +391,11 @@ async function checkCond(roleId: string, heroes, type: number, param: number, cn
return false;
}
export async function checkTaskConditions(roleId: string, heroes: number[], condition: { type: number, param: number, count: number }[]) {
export function checkTaskConditions(heroes: TaskHero[], condition: { type: number, param: number, count: number }[]) {
let res = true;
for (let { type, param, count } of condition) {
const checkRes = await checkCond(roleId, heroes, type, param, count);
const checkRes = checkCond(heroes, type, param, count);
if (!checkRes) {
res = false;
break;
@@ -556,9 +551,9 @@ export async function getTasksReward(roleId: string, curTime: Date) {
if (task.sendTime && task.sendTime.getTime() + completeTime * 1000 < curTime.getTime()) {
goods = goods.concat(reward);
if (termsForAdd) {
const result = checkTaskConditions(roleId, task.heroes, termsForAdd);
const result = checkTaskConditions(task.heroes, termsForAdd);
if (result) {
goods = goods.concat(additionalReward);
goods.push(...additionalReward);
}
}
}
@@ -587,6 +582,7 @@ export function getRandRobot(cnt = 1, withAttr = false) {
let dicHero = gameData.hero.get(hero.actorId);
heroes.push({
id: hero.actorId,
skinId: hero.actorId,
star: hero.star||dicHero.initialStars,
colorStar: 0,
lv: hero.lv,

3
game-server/app/services/expeditionService.ts
View File

@@ -157,6 +157,7 @@ export async function matchPlayers(roleId: string, scale: number, range: number,
let { attribute } = getPlayerAttribute(lv, heroAttrs, roleAttrs);
let heroInfo = {
actorId: hero.actorId,
skinId: hero.skinId,
actorName: dicHero.name,
skill:0,
seid:'&',
@@ -202,7 +203,7 @@ export async function matchRobots(scale: number, myCe: number, robotCe: number,
const { attribute, enemyCount } = json;
let { attribute: newAttribute, ce } = getRobotAttribute(attribute, enemyCount, dicExpeditionSubAttr.attribute, dicExpeditionSubAttr.lv, myCe, robotCe, scale);
enemyObj.enemies.push({...json, attribute: newAttribute, lv, ce});
enemyObj.enemies.push({...json, skinId: json.actorId, attribute: newAttribute, lv, ce});
allCe += ce;
}
}

9
game-server/app/services/normalBattleService.ts
View File

@@ -1,5 +1,5 @@
import { HeroModel } from '../db/Hero';
import { HeroModel, HeroType } from '../db/Hero';
import Role, { RoleModel, RoleType } from '../db/Role'
import { getLvByExp, getExpByLv, gameData, getDicApByLv } from '../pubUtils/data';
import { updateUserInfo } from './redisService';
@@ -83,7 +83,7 @@ export async function roleLevelup(type: KING_EXP_RATIO_TYPE, roleId: string, kin
export async function checkBattleHeroes(roleId: string, seqIds: Array<number> = []) {
let heroes: number[] = [], lineup: LineupParam[] = [];
let hids: number[] = [], lineup: LineupParam[] = [], heroes: HeroType[] = [];
let flag = true;
// if (seqIds.length <= 0) flag = false;
@@ -94,10 +94,11 @@ export async function checkBattleHeroes(roleId: string, seqIds: Array<number> =
if (!hero) {
flag = false; break;
}
heroes.push(hero.hid);
hids.push(hero.hid);
lineup.push(new LineupParam(hero));
heroes.push(hero);
}
return { isOK: flag, heroes, seqIds, lineup };
return { isOK: flag, hids, heroes, seqIds, lineup };
}
export async function checkBattleHeroesByHid(roleId: string, heroes: Array<number> = []) {

7
game-server/app/services/pvpService.ts
View File

@@ -36,6 +36,7 @@ export async function initPvpInfo(role: RoleType) {
if (item) defCe += item.ce;
heroes.push({
actorId: item?.hid || 0,
skinId: item?.hid || 0,
hero: item?.hero || null,
ce: item?.ce || 0,
dataId: i,
@@ -592,11 +593,11 @@ export async function generMyRecInfo(heroScores: HeroScores[], winStreakNum: num
hid, addScore: 0, plusScore: 0, score: curHeroScore ? curHeroScore.score : 0
});
}
const myHero = await HeroModel.findByHidAndRole(hid, roleId, 'quality star colorStar lv');
let { quality, star, colorStar, lv } = myHero;
const myHero = await HeroModel.findByHidAndRole(hid, roleId, 'quality star colorStar lv skinId');
let { quality, star, colorStar, lv, skinId } = myHero;
myHeroRecords.push({
hid, quality, star, colorStar, lv, damage, heal, underDamage
hid, quality, star, colorStar, lv, damage, heal, underDamage, skinId
});
}