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

活动：任务接口添加serverId接口

Browse Source
This commit is contained in:
qiaoxin
2021-05-20 19:25:52 +08:00
parent d637e5701d
commit 718f19a42a
39 changed files with 481 additions and 465 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/activity/handler/gachaHandler.ts
+4 -3
View File
@@ -74,7 +74,7 @@ export class GachaHandler {
let userGacha = await UserGachaModel.findByRole(roleId, gachaId, activityId); let userGacha = await UserGachaModel.findByRole(roleId, gachaId, activityId);
let { floor, freeCount, hope, point, pickHero, refFreeTime, count: historyCount } = await refreshGacha(dicGacha, userGacha); let { floor, freeCount, hope, point, pickHero, refFreeTime, count: historyCount } = await refreshGacha(dicGacha, userGacha);
if((gachaId == GACHA_ID.ASSIGN|| gachaId == GACHA_ID.TIMELIMIT) && !pickHero) return resResult(STATUS.GACHA_NOT_ASSIGN); if ((gachaId == GACHA_ID.ASSIGN || gachaId == GACHA_ID.TIMELIMIT) && !pickHero) return resResult(STATUS.GACHA_NOT_ASSIGN);
let userHeroes = await HeroModel.findByRole(roleId); let userHeroes = await HeroModel.findByRole(roleId);
@@ -155,7 +155,7 @@ export class GachaHandler {
for (let { hid } of hope) { for (let { hid } of hope) {
let dicHero = gameData.hero.get(hid); let dicHero = gameData.hero.get(hid);
if(hid != 0) { if (hid != 0) {
if (!dicHero) return resResult(STATUS.DIC_DATA_NOT_FOUND); if (!dicHero) return resResult(STATUS.DIC_DATA_NOT_FOUND);
if (hid != 0 && dicHero.quality != HERO_QUALITY_TYPE.GOLD) { if (hid != 0 && dicHero.quality != HERO_QUALITY_TYPE.GOLD) {
return resResult(STATUS.GACHA_HOPE_NOT_GOLD); return resResult(STATUS.GACHA_HOPE_NOT_GOLD);
@@ -255,6 +255,7 @@ export class GachaHandler {
async setPickHero(msg: { gachaId: number, activityId: number, pickHero: number }, session: BackendSession) { async setPickHero(msg: { gachaId: number, activityId: number, pickHero: number }, session: BackendSession) {
const { gachaId, activityId = 0, pickHero } = msg; const { gachaId, activityId = 0, pickHero } = msg;
const roleId: string = session.get('roleId'); const roleId: string = session.get('roleId');
const serverId: number = session.get('serverId');
if (gachaId != GACHA_ID.ASSIGN && gachaId != GACHA_ID.TIMELIMIT) if (gachaId != GACHA_ID.ASSIGN && gachaId != GACHA_ID.TIMELIMIT)
return resResult(STATUS.WRONG_PARMS); return resResult(STATUS.WRONG_PARMS);
let dicHero = gameData.hero.get(pickHero); let dicHero = gameData.hero.get(pickHero);
@@ -262,7 +263,7 @@ export class GachaHandler {
let heroes: number[] = []; let heroes: number[] = [];
if (gachaId == GACHA_ID.TIMELIMIT) { if (gachaId == GACHA_ID.TIMELIMIT) {
let activityData = await ActivityModel.findActivity(activityId, true); let activityData = await ActivityModel.findActivity(serverId, activityId, true);
if (!activityData) return resResult(STATUS.ACTIVITY_MISSING); if (!activityData) return resResult(STATUS.ACTIVITY_MISSING);
let gachaData = new GachaData(activityData); let gachaData = new GachaData(activityData);
game-server/app/servers/activity/handler/popUpShopHandler.ts
+1 -1
View File
@@ -51,7 +51,7 @@ export class PopUpShopHandler {
const roleName = session.get('roleName'); const roleName = session.get('roleName');
const funcs: number[] = session.get('funcs'); const funcs: number[] = session.get('funcs');
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true); let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
if (!activityData) { if (!activityData) {
return resResult(STATUS.ACTIVITY_MISSING); return resResult(STATUS.ACTIVITY_MISSING);
} }
game-server/app/servers/activity/handler/selfServiceShopHandler.ts
+1 -1
View File
@@ -50,7 +50,7 @@ export class SelfServiceShopHandler {
const roleName = session.get('roleName'); const roleName = session.get('roleName');
const funcs: number[] = session.get('funcs'); const funcs: number[] = session.get('funcs');
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true); let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerData = new SelfServiceShopData(activityData); let playerData = new SelfServiceShopData(activityData);
let item = playerData.getItem(index); let item = playerData.getItem(index);
game-server/app/servers/activity/handler/thirtyDaysHandler.ts
+1 -1
View File
@@ -55,7 +55,7 @@ export class ThirtyDaysHandler {
let todayIndex = await playerThirtyDaysActivityDays(roleId);//玩家当前的天数 let todayIndex = await playerThirtyDaysActivityDays(roleId);//玩家当前的天数
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(ACTIVITY_TYPE.THIRTY_DAYS, true) let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, ACTIVITY_TYPE.THIRTY_DAYS, true)
activityArray = activityArray.sort((a, b) => { activityArray = activityArray.sort((a, b) => {
return a.activityId - b.activityId return a.activityId - b.activityId
}); });
game-server/app/servers/battle/handler/expeditionBattleHandler.ts
+73 -72
View File
@@ -16,7 +16,7 @@ import { checkBattleHeroes, roleLevelup } from '../../../services/normalBattleSe
import { checkTask, checkTaskInBattleEnd } from '../../../services/taskService'; import { checkTask, checkTaskInBattleEnd } from '../../../services/taskService';
import { gameData } from '../../../pubUtils/data'; import { gameData } from '../../../pubUtils/data';
export default function(app: Application) { export default function (app: Application) {
return new ExpeditionBattleHandler(app); return new ExpeditionBattleHandler(app);
} }
@@ -27,14 +27,14 @@ export class ExpeditionBattleHandler {
/** /**
* 获取初始数据 * 获取初始数据
* 获取当前远征挑战情况，远征点数，点数宝箱领取情况 */ * 获取当前远征挑战情况，远征点数，点数宝箱领取情况 */
async getStatus(msg: { }, session: BackendSession) { async getStatus(msg: {}, session: BackendSession) {
let roleId = session.get('roleId'); let roleId = session.get('roleId');
let roleName = session.get('roleName'); let roleName = session.get('roleName');
// 获取远征关卡状态 // 获取远征关卡状态
let expeditionRecord = await ExpeditionRecordModel.getCurRecord(roleId); let expeditionRecord = await ExpeditionRecordModel.getCurRecord(roleId);
if(!expeditionRecord) { // 首次新建一条记录 if (!expeditionRecord) { // 首次新建一条记录
// 我方战力 // 我方战力
let myCe = await calculateSumCE(roleId, 1, { num: LINEUP_NUM }); let myCe = await calculateSumCE(roleId, 1, { num: LINEUP_NUM });
expeditionRecord = await ExpeditionRecordModel.createRecord({ expeditionRecord = await ExpeditionRecordModel.createRecord({
@@ -47,39 +47,39 @@ export class ExpeditionBattleHandler {
let { expeditionCode, heroes } = expeditionRecord; let { expeditionCode, heroes } = expeditionRecord;
let expeditionWarRecord = await ExpeditionWarRecordModel.getRecordByCode(expeditionCode); let expeditionWarRecord = await ExpeditionWarRecordModel.getRecordByCode(expeditionCode);
let curLv = 0; let curLv = 0;
if(expeditionWarRecord.length > 0) { if (expeditionWarRecord.length > 0) {
curLv = expeditionWarRecord[expeditionWarRecord.length - 1].expeditionId; curLv = expeditionWarRecord[expeditionWarRecord.length - 1].expeditionId;
} }
// 重置次数 // 重置次数
let role = await RoleModel.findByRoleId(roleId); let role = await RoleModel.findByRoleId(roleId);
let curTime = new Date(); let curTime = new Date();
let {resetCnt} = await getResetRemainCnt(curTime, roleId, role); let { resetCnt } = await getResetRemainCnt(curTime, roleId, role);
// 点数，和宝箱领取状态 // 点数，和宝箱领取状态
let pointRewards = await getPointRewardStatus(roleId, role); let pointRewards = await getPointRewardStatus(roleId, role);
return resResult(STATUS.SUCCESS, { return resResult(STATUS.SUCCESS, {
expeditionCode, expeditionCode,
curLv, curLv,
expeditionWarRecord, expeditionWarRecord,
pointRewards, pointRewards,
heroes: heroes.map(cur => {return {"dataId": cur.seqId, "hp": cur.hp, "ap": cur.ap}}), heroes: heroes.map(cur => { return { "dataId": cur.seqId, "hp": cur.hp, "ap": cur.ap } }),
resetCnt resetCnt
}); });
} }
/** /**
* 重置远征本 * 重置远征本
* 每天5点可以重置远征本 */ * 每天5点可以重置远征本 */
async resetStatus(msg: { }, session: BackendSession) { async resetStatus(msg: {}, session: BackendSession) {
let roleId = session.get('roleId'); let roleId = session.get('roleId');
let roleName = session.get('roleName'); let roleName = session.get('roleName');
let curTime = new Date(); let curTime = new Date();
let {needRefresh, resetCnt} = await getResetRemainCnt(curTime, roleId); let { needRefresh, resetCnt } = await getResetRemainCnt(curTime, roleId);
if(resetCnt <= 0) { if (resetCnt <= 0) {
return resResult(STATUS.EXPEDITION_RESET_NUM_NOT_ENOUGH) return resResult(STATUS.EXPEDITION_RESET_NUM_NOT_ENOUGH)
} }
@@ -91,20 +91,20 @@ export class ExpeditionBattleHandler {
let { expeditionCode, heroes } = await ExpeditionRecordModel.createRecord({ let { expeditionCode, heroes } = await ExpeditionRecordModel.createRecord({
roleId, roleName, heroes: [], myCe roleId, roleName, heroes: [], myCe
}); });
await findOrCreateEnemies(roleId, myCe, expeditionCode, 1, EXPEDITION_WAR_RECORD_STATUS.WAITING); await findOrCreateEnemies(roleId, myCe, expeditionCode, 1, EXPEDITION_WAR_RECORD_STATUS.WAITING);
await RoleModel.increaseExpeditionResetCnt(roleId, needRefresh, curTime); await RoleModel.increaseExpeditionResetCnt(roleId, needRefresh, curTime);
let expeditionWarRecord = await ExpeditionWarRecordModel.getRecordByCode(expeditionCode); let expeditionWarRecord = await ExpeditionWarRecordModel.getRecordByCode(expeditionCode);
let curLv = 0; let curLv = 0;
if(expeditionWarRecord.length > 0) { if (expeditionWarRecord.length > 0) {
curLv = expeditionWarRecord[expeditionWarRecord.length - 1].expeditionId; curLv = expeditionWarRecord[expeditionWarRecord.length - 1].expeditionId;
} }
return resResult(STATUS.SUCCESS, { return resResult(STATUS.SUCCESS, {
expeditionCode, expeditionCode,
curLv, curLv,
expeditionWarRecord, expeditionWarRecord,
heroes, heroes,
resetCnt: resetCnt - 1 resetCnt: resetCnt - 1
}); });
} }
@@ -121,15 +121,15 @@ export class ExpeditionBattleHandler {
let { myCe } = await ExpeditionRecordModel.getExpeditionRecordByCode(expeditionCode); let { myCe } = await ExpeditionRecordModel.getExpeditionRecordByCode(expeditionCode);
let curExpeditionWarRecord = await findOrCreateEnemies(roleId, myCe, expeditionCode, expeditionId, EXPEDITION_WAR_RECORD_STATUS.WAITING); let curExpeditionWarRecord = await findOrCreateEnemies(roleId, myCe, expeditionCode, expeditionId, EXPEDITION_WAR_RECORD_STATUS.WAITING);
if(!curExpeditionWarRecord) { if (!curExpeditionWarRecord) {
return resResult(STATUS.EXPEDITION_MATCH_NO_PLAYER); return resResult(STATUS.EXPEDITION_MATCH_NO_PLAYER);
} }
let { battleId, enemyFrom, enemies, battleStatus, ce: curCe } = curExpeditionWarRecord; let { battleId, enemyFrom, enemies, battleStatus, ce: curCe } = curExpeditionWarRecord;
let nextCe = 0; // 下一关战力 let nextCe = 0; // 下一关战力
if(gameData.expedition.has(expeditionId + 1)) { if (gameData.expedition.has(expeditionId + 1)) {
let nextExpeditionWarRecord = await findOrCreateEnemies(roleId, myCe, expeditionCode, expeditionId + 1, EXPEDITION_WAR_RECORD_STATUS.HIDE); let nextExpeditionWarRecord = await findOrCreateEnemies(roleId, myCe, expeditionCode, expeditionId + 1, EXPEDITION_WAR_RECORD_STATUS.HIDE);
if(nextExpeditionWarRecord) nextCe = nextExpeditionWarRecord.ce; if (nextExpeditionWarRecord) nextCe = nextExpeditionWarRecord.ce;
} }
return resResult(STATUS.SUCCESS, { return resResult(STATUS.SUCCESS, {
@@ -146,36 +146,36 @@ export class ExpeditionBattleHandler {
* 进入战斗 * 进入战斗
* 记录我军数据，生成战斗唯一表示，记录状态 * 记录我军数据，生成战斗唯一表示，记录状态
*/ */
async checkBattle(msg: { expeditionCode: string, expeditionId: number, battleId: number, heroes: Array<number> }, session: BackendSession) { async checkBattle(msg: { expeditionCode: string, expeditionId: number, battleId: number, heroes: Array<number> }, session: BackendSession) {
const { expeditionCode, expeditionId, battleId, heroes: seqIds = [] } = msg; const { expeditionCode, expeditionId, battleId, heroes: seqIds = [] } = msg;
let roleId = session.get('roleId'); let roleId = session.get('roleId');
let roleName = session.get('roleName'); let roleName = session.get('roleName');
let warInfo = gameData.war.get(battleId); let warInfo = gameData.war.get(battleId);
if(!warInfo) { if (!warInfo) {
return resResult(STATUS.BATTLE_MISS_INFO); return resResult(STATUS.BATTLE_MISS_INFO);
} }
let apJson = await getAp(Date.now(), roleId); let apJson = await getAp(Date.now(), roleId);
let {ap} = apJson; let { ap } = apJson;
if(ap < warInfo.cost) { if (ap < warInfo.cost) {
return resResult(STATUS.BATTLE_ACTION_POINT_LACK); return resResult(STATUS.BATTLE_ACTION_POINT_LACK);
} }
// 前置关卡是否挑战过 // 前置关卡是否挑战过
let previousGk = warInfo.previousGk; let previousGk = warInfo.previousGk;
if(previousGk) { if (previousGk) {
let preBattle = await BattleRecordModel.getBattleRecordByIdAndStatus(roleId, previousGk, 1); let preBattle = await BattleRecordModel.getBattleRecordByIdAndStatus(roleId, previousGk, 1);
if(!preBattle) return resResult(STATUS.BATTLE_NEED_PREVIOUS_GK); if (!preBattle) return resResult(STATUS.BATTLE_NEED_PREVIOUS_GK);
} }
let { isOK, heroes } = await checkBattleHeroes(roleId, seqIds); let { isOK, heroes } = await checkBattleHeroes(roleId, seqIds);
if(!isOK) return resResult(STATUS.BATTLE_HERO_NOT_FOUND); if (!isOK) return resResult(STATUS.BATTLE_HERO_NOT_FOUND);
let expeditionWarRecord = await ExpeditionWarRecordModel.getRecordByCodeAndId(expeditionCode, expeditionId); let expeditionWarRecord = await ExpeditionWarRecordModel.getRecordByCodeAndId(expeditionCode, expeditionId);
if(!expeditionWarRecord ) { if (!expeditionWarRecord) {
return resResult(STATUS.EXPEDITION_MISS_WAR_RECORD); return resResult(STATUS.EXPEDITION_MISS_WAR_RECORD);
} }
if(expeditionWarRecord.battleStatus == EXPEDITION_WAR_RECORD_STATUS.SUCCESS) { if (expeditionWarRecord.battleStatus == EXPEDITION_WAR_RECORD_STATUS.SUCCESS) {
return resResult(STATUS.EXPEDITION_DUPLICATE_CHALLENGE); return resResult(STATUS.EXPEDITION_DUPLICATE_CHALLENGE);
} }
@@ -193,12 +193,12 @@ export class ExpeditionBattleHandler {
let result = await ExpeditionWarRecordModel.updateBattleCode(expeditionCode, expeditionId, EXPEDITION_WAR_RECORD_STATUS.WAITING, battleCode); let result = await ExpeditionWarRecordModel.updateBattleCode(expeditionCode, expeditionId, EXPEDITION_WAR_RECORD_STATUS.WAITING, battleCode);
return resResult(STATUS.SUCCESS, { return resResult(STATUS.SUCCESS, {
expeditionCode, expeditionCode,
expeditionId, expeditionId,
battleId, battleId,
battleCode, battleCode,
battleStatus: result.battleStatus, battleStatus: result.battleStatus,
apJson apJson
}); });
} }
@@ -206,77 +206,78 @@ export class ExpeditionBattleHandler {
* 战斗结算 * 战斗结算
* 结算战斗奖励，更新远征状态 * 结算战斗奖励，更新远征状态
*/ */
async battleEnd(msg: { expeditionCode: string, expeditionId: number, battleCode: string, battleId: number, isSuccess: boolean, heroes: Array<{dataId: number, hp: number, ap: number}>, enemies: Array<{dataId: number, hp: number, ap: number}>, star: number }, session: BackendSession) { async battleEnd(msg: { expeditionCode: string, expeditionId: number, battleCode: string, battleId: number, isSuccess: boolean, heroes: Array<{ dataId: number, hp: number, ap: number }>, enemies: Array<{ dataId: number, hp: number, ap: number }>, star: number }, session: BackendSession) {
const { expeditionCode, battleCode, battleId, expeditionId, isSuccess, heroes = [], star, enemies } = msg; const { expeditionCode, battleCode, battleId, expeditionId, isSuccess, heroes = [], star, enemies } = msg;
let roleId = session.get('roleId'); let roleId = session.get('roleId');
let roleName = session.get('roleName'); let roleName = session.get('roleName');
const serverId = session.get('serverId');
let sid = session.get('sid'); let sid = session.get('sid');
let funcs: number[] = session.get('funcs'); let funcs: number[] = session.get('funcs');
let warInfo = gameData.war.get(battleId); let warInfo = gameData.war.get(battleId);
if(!warInfo) { if (!warInfo) {
return resResult(STATUS.BATTLE_MISS_INFO); return resResult(STATUS.BATTLE_MISS_INFO);
} }
const BattleRecord = await BattleRecordModel.getBattleRecordByCode(battleCode); const BattleRecord = await BattleRecordModel.getBattleRecordByCode(battleCode);
if(!BattleRecord || BattleRecord.status != 0) { if (!BattleRecord || BattleRecord.status != 0) {
return resResult(STATUS.BATTLE_STATUS_WRONG); return resResult(STATUS.BATTLE_STATUS_WRONG);
} }
let flag = 1; // 对比hero信息 let flag = 1; // 对比hero信息
let { record: { heroes: dbHeroes, seqIds: dbSeqIds } } = BattleRecord; let { record: { heroes: dbHeroes, seqIds: dbSeqIds } } = BattleRecord;
for(let {dataId} of heroes) { for (let { dataId } of heroes) {
if(dbSeqIds.indexOf(dataId) == -1) flag = 0; if (dbSeqIds.indexOf(dataId) == -1) flag = 0;
} }
if(!flag) { if (!flag) {
return resResult(STATUS.BATTLE_INFO_VALIDATE_ERR); return resResult(STATUS.BATTLE_INFO_VALIDATE_ERR);
} }
const now = Date.now(); // 当前时间戳 const now = Date.now(); // 当前时间戳
let apJson = await setAp(now, roleId, sid, funcs, -1 * warInfo.cost); // 扣除体力 let apJson = await setAp(now, roleId, sid, funcs, -1 * warInfo.cost); // 扣除体力
if(!apJson) { if (!apJson) {
return resResult(STATUS.BATTLE_ACTION_POINT_LACK); return resResult(STATUS.BATTLE_ACTION_POINT_LACK);
} }
// 检查record // 检查record
let expeditionRecord = await ExpeditionRecordModel.getExpeditionRecordByCode(expeditionCode); let expeditionRecord = await ExpeditionRecordModel.getExpeditionRecordByCode(expeditionCode);
let expeditionWarRecord = await ExpeditionWarRecordModel.getRecordByCodeAndId(expeditionCode, expeditionId); let expeditionWarRecord = await ExpeditionWarRecordModel.getRecordByCodeAndId(expeditionCode, expeditionId);
if(!expeditionRecord|| !expeditionWarRecord) { if (!expeditionRecord || !expeditionWarRecord) {
return resResult(STATUS.EXPEDITION_MISS_WAR_RECORD); return resResult(STATUS.EXPEDITION_MISS_WAR_RECORD);
} }
// 更新我方剩余血量 // 更新我方剩余血量
await ExpeditionRecordModel.updateHeroStatus(expeditionCode, expeditionRecord.heroes, heroes); await ExpeditionRecordModel.updateHeroStatus(expeditionCode, expeditionRecord.heroes, heroes);
// 更新敌人剩余状态及战斗状态 // 更新敌人剩余状态及战斗状态
let battleStatus = isSuccess?EXPEDITION_WAR_RECORD_STATUS.SUCCESS:EXPEDITION_WAR_RECORD_STATUS.FAIL; let battleStatus = isSuccess ? EXPEDITION_WAR_RECORD_STATUS.SUCCESS : EXPEDITION_WAR_RECORD_STATUS.FAIL;
expeditionWarRecord = await ExpeditionWarRecordModel.updateEnemiesStatus(expeditionCode, expeditionId, battleStatus, enemies); expeditionWarRecord = await ExpeditionWarRecordModel.updateEnemiesStatus(expeditionCode, expeditionId, battleStatus, enemies);
// 更新battleRecord状态 // 更新battleRecord状态
await BattleRecordModel.updateBattleRecordByCode(battleCode, { await BattleRecordModel.updateBattleRecordByCode(battleCode, {
$set: { status: isSuccess?1: 2, star } $set: { status: isSuccess ? 1 : 2, star }
}, true); }, true);
// 更新点数 // 更新点数
let role = await RoleModel.increaseExpeditionPoint(roleId, isSuccess?EXPEDITION_CONST.INCREASE_POINT:0); let role = await RoleModel.increaseExpeditionPoint(roleId, isSuccess ? EXPEDITION_CONST.INCREASE_POINT : 0);
let { expeditionPoint = 0 } = role; let { expeditionPoint = 0 } = role;
// 关卡奖励 // 关卡奖励
let warReward = new WarReward(roleId, roleName, sid, battleId, isSuccess); let warReward = new WarReward(roleId, roleName, sid, battleId, isSuccess);
let reward = await warReward.saveReward(1); let reward = await warReward.saveReward(1);
let actordata = await roleLevelup(roleId, isSuccess?warInfo.kingExp:0, session);// 主公升级经验 let actordata = await roleLevelup(roleId, isSuccess ? warInfo.kingExp : 0, session);// 主公升级经验
if(isSuccess) { if (isSuccess) {
// 更新下一关状态 // 更新下一关状态
await ExpeditionWarRecordModel.updateStatus(expeditionCode, expeditionId + 1, EXPEDITION_WAR_RECORD_STATUS.WAITING); await ExpeditionWarRecordModel.updateStatus(expeditionCode, expeditionId + 1, EXPEDITION_WAR_RECORD_STATUS.WAITING);
} }
await checkTaskInBattleEnd(roleId, sid, funcs, battleId, dbHeroes, star); await checkTaskInBattleEnd(serverId, roleId, sid, funcs, battleId, dbHeroes, star);
return resResult(STATUS.SUCCESS, { return resResult(STATUS.SUCCESS, {
expeditionCode, expeditionId, expeditionCode, expeditionId,
battleCode, battleId, battleCode, battleId,
battleStatus: expeditionWarRecord.battleStatus, battleStatus: expeditionWarRecord.battleStatus,
battleGoods: reward, battleGoods: reward,
apJson, apJson,
expeditionPoint, expeditionPoint,
...actordata ...actordata
}); });
} }
@@ -293,36 +294,36 @@ export class ExpeditionBattleHandler {
const funcs: number[] = session.get('funcs'); const funcs: number[] = session.get('funcs');
let role = await RoleModel.findByRoleId(roleId); let role = await RoleModel.findByRoleId(roleId);
let {expeditionPoint} = role; let { expeditionPoint } = role;
let dicExpeditionPoint = gameData.expeditionPoint; let dicExpeditionPoint = gameData.expeditionPoint;
let curDicExpeditionPoint = dicExpeditionPoint.get(point); let curDicExpeditionPoint = dicExpeditionPoint.get(point);
if(!curDicExpeditionPoint) { if (!curDicExpeditionPoint) {
return resResult(STATUS.EXPEDITION_MISS_POINT_INFO); return resResult(STATUS.EXPEDITION_MISS_POINT_INFO);
} }
if(point > expeditionPoint) { if (point > expeditionPoint) {
return resResult(STATUS.EXPEDITION_POINT_NOT_ENOUGH); return resResult(STATUS.EXPEDITION_POINT_NOT_ENOUGH);
} }
let pointStatusInDatabase = await ExpeditionPointModel.getExpeditionPoint(roleId); let pointStatusInDatabase = await ExpeditionPointModel.getExpeditionPoint(roleId);
if(pointStatusInDatabase) { if (pointStatusInDatabase) {
let {rewards} = pointStatusInDatabase; let { rewards } = pointStatusInDatabase;
let curReward = rewards.find(cur => cur.point == point); let curReward = rewards.find(cur => cur.point == point);
if(curReward && curReward.received) { if (curReward && curReward.received) {
return resResult(STATUS.EXPEDITION_WRONG_RECEIVE_STATUS); return resResult(STATUS.EXPEDITION_WRONG_RECEIVE_STATUS);
} }
} }
// 标记状态 // 标记状态
let {rewards: resultRewards} = await ExpeditionPointModel.updatePointStatus(roleId, point, curDicExpeditionPoint.reward); let { rewards: resultRewards } = await ExpeditionPointModel.updatePointStatus(roleId, point, curDicExpeditionPoint.reward);
let hasReceivedAll = true, maxPoint = 0; let hasReceivedAll = true, maxPoint = 0;
for(let [ point ] of dicExpeditionPoint) { for (let [point] of dicExpeditionPoint) {
let curReward = resultRewards.find(cur => cur.point == point); let curReward = resultRewards.find(cur => cur.point == point);
if(!curReward || !curReward.received) { if (!curReward || !curReward.received) {
hasReceivedAll = false; hasReceivedAll = false;
} }
if(point > maxPoint) maxPoint = point; if (point > maxPoint) maxPoint = point;
} }
if(hasReceivedAll) { // 全部领取了，刷新 if (hasReceivedAll) { // 全部领取了，刷新
await ExpeditionPointModel.completeStatus(roleId); await ExpeditionPointModel.completeStatus(roleId);
await RoleModel.increaseExpeditionPoint(roleId, maxPoint * -1); await RoleModel.increaseExpeditionPoint(roleId, maxPoint * -1);
} }
@@ -334,7 +335,7 @@ export class ExpeditionBattleHandler {
let goods = await addItems(roleId, roleName, sid, curDicExpeditionPoint.reward); let goods = await addItems(roleId, roleName, sid, curDicExpeditionPoint.reward);
return resResult(STATUS.SUCCESS, { return resResult(STATUS.SUCCESS, {
costPoint: hasReceivedAll?maxPoint: 0, costPoint: hasReceivedAll ? maxPoint : 0,
pointRewards, pointRewards,
goods goods
}) })
game-server/app/servers/battle/handler/guildTrainHandler.ts
+1 -1
View File
@@ -271,7 +271,7 @@ export class GuildTrainHandler {
} }
await checkTask(roleId, sid, funcs, TASK_TYPE.GUILD_TRAIN, 1, true, {}); await checkTask(roleId, sid, funcs, TASK_TYPE.GUILD_TRAIN, 1, true, {});
//成长任务 //成长任务
await accomplishTask(roleId, TASK_TYPE.GUILD_TRAIN, 1) await accomplishTask(serverId, roleId, TASK_TYPE.GUILD_TRAIN, 1)
return resResult(STATUS.SUCCESS, result); return resResult(STATUS.SUCCESS, result);
} }
game-server/app/servers/battle/handler/normalBattleHandler.ts
+72 -72
View File
@@ -4,7 +4,7 @@ import { BattleSweepRecordModel } from '../../../db/BattleSweepRecord';
import { genCode } from '../../../pubUtils/util'; import { genCode } from '../../../pubUtils/util';
import { WAR_TYPE, EVENT_STATUS, FUNC_OPT_TYPE, MSG_SOURCE, REDIS_KEY, TASK_TYPE } from '../../../consts'; import { WAR_TYPE, EVENT_STATUS, FUNC_OPT_TYPE, MSG_SOURCE, REDIS_KEY, TASK_TYPE } from '../../../consts';
import { checkDaily, checkDailyAndIncrease } from '../../../services/dailyBattleService'; import { checkDaily, checkDailyAndIncrease } from '../../../services/dailyBattleService';
import { checkTowerWar, towerBattleEnd } from '../../../services/battleService'; import { checkTowerWar, towerBattleEnd } from '../../../services/battleService';
import { WarReward } from '../../../services/warRewardService'; import { WarReward } from '../../../services/warRewardService';
import { getAp, setAp } from '../../../services/actionPointService'; import { getAp, setAp } from '../../../services/actionPointService';
import { setBattleStatus, checkEventBattle } from '../../../services/eventSercive'; import { setBattleStatus, checkEventBattle } from '../../../services/eventSercive';
@@ -21,7 +21,7 @@ import { nowSeconds } from '../../../pubUtils/timeUtil';
import { Rank } from '../../../services/rankService'; import { Rank } from '../../../services/rankService';
import { checkTaskWithWar, checkTaskInBattleEnd } from '../../../services/taskService'; import { checkTaskWithWar, checkTaskInBattleEnd } from '../../../services/taskService';
export default function(app: Application) { export default function (app: Application) {
return new NormalBattleHandler(app); return new NormalBattleHandler(app);
} }
@@ -30,57 +30,57 @@ export class NormalBattleHandler {
} }
// 获取关卡列表 // 获取关卡列表
async checkBattle(msg: {battleId: number, heroes: Array<number> }, session: BackendSession) { async checkBattle(msg: { battleId: number, heroes: Array<number> }, session: BackendSession) {
const { battleId, heroes: seqIds = [] } = msg; const { battleId, heroes: seqIds = [] } = msg;
let roleId = session.get('roleId'); let roleId = session.get('roleId');
let roleName = session.get('roleName'); let roleName = session.get('roleName');
let warInfo = gameData.war.get(battleId); let warInfo = gameData.war.get(battleId);
if(!warInfo) { if (!warInfo) {
return resResult(STATUS.BATTLE_MISS_INFO); return resResult(STATUS.BATTLE_MISS_INFO);
} }
let apJson = await getAp(Date.now(), roleId); let apJson = await getAp(Date.now(), roleId);
let {ap} = apJson; let { ap } = apJson;
if(ap < warInfo.cost) { if (ap < warInfo.cost) {
return resResult(STATUS.BATTLE_ACTION_POINT_LACK); return resResult(STATUS.BATTLE_ACTION_POINT_LACK);
} }
// 前置关卡是否挑战过 // 前置关卡是否挑战过
let previousGk = warInfo.previousGk; let previousGk = warInfo.previousGk;
if(previousGk) { if (previousGk) {
let {warStar} = await RoleModel.findByRoleId(roleId); let { warStar } = await RoleModel.findByRoleId(roleId);
let preBattle = warStar.findIndex(cur => cur.id == previousGk); let preBattle = warStar.findIndex(cur => cur.id == previousGk);
if(preBattle == -1) return resResult(STATUS.BATTLE_NEED_PREVIOUS_GK); if (preBattle == -1) return resResult(STATUS.BATTLE_NEED_PREVIOUS_GK);
} }
let { isOK, heroes } = await checkBattleHeroes(roleId, seqIds); let { isOK, heroes } = await checkBattleHeroes(roleId, seqIds);
if(!isOK) return resResult(STATUS.BATTLE_HERO_NOT_FOUND); if (!isOK) return resResult(STATUS.BATTLE_HERO_NOT_FOUND);
const battleCode = genCode(8); // 关卡唯一值 const battleCode = genCode(8); // 关卡唯一值
let dailyNum = {}; let dailyNum = {};
let towerData = {}; let towerData = {};
let dungeonNum = {}; let dungeonNum = {};
if(warInfo.warType == WAR_TYPE.DAILY) { if (warInfo.warType == WAR_TYPE.DAILY) {
let checkResult = await checkDaily(roleId, battleId, 1); let checkResult = await checkDaily(roleId, battleId, 1);
if(checkResult.status == -1) { if (checkResult.status == -1) {
return checkResult.resResult return checkResult.resResult
} }
dailyNum = Object.assign(dailyNum, checkResult.data); dailyNum = Object.assign(dailyNum, checkResult.data);
} else if (warInfo.warType == WAR_TYPE.TOWER) { } else if (warInfo.warType == WAR_TYPE.TOWER) {
let checkResult = await checkTowerWar(roleId, battleId, heroes); let checkResult = await checkTowerWar(roleId, battleId, heroes);
if(checkResult.status == -1) { if (checkResult.status == -1) {
return checkResult.resResult return checkResult.resResult
} }
towerData = Object.assign(towerData, checkResult.data); towerData = Object.assign(towerData, checkResult.data);
} else if (warInfo.warType == WAR_TYPE.EVENT) { } else if (warInfo.warType == WAR_TYPE.EVENT) {
// 记录事件状态 // 记录事件状态
let eventStatus = session.get('eventStatus')||EVENT_STATUS.WAITING; let eventStatus = session.get('eventStatus') || EVENT_STATUS.WAITING;
let checkResult = await checkEventBattle( roleId, eventStatus, battleId, battleCode); let checkResult = await checkEventBattle(roleId, eventStatus, battleId, battleCode);
if(checkResult.status == -1) { if (checkResult.status == -1) {
return checkResult.resResult return checkResult.resResult
} }
} else if (warInfo.warType == WAR_TYPE.MYSTERY || warInfo.warType == WAR_TYPE.MYSTERY_ELITE) { } else if (warInfo.warType == WAR_TYPE.MYSTERY || warInfo.warType == WAR_TYPE.MYSTERY_ELITE) {
let checkResult = await checkDungeonNum(roleId, 1); let checkResult = await checkDungeonNum(roleId, 1);
if(checkResult.status == -1) { if (checkResult.status == -1) {
return checkResult.resResult return checkResult.resResult
} }
dungeonNum = Object.assign(dungeonNum, checkResult.data); dungeonNum = Object.assign(dungeonNum, checkResult.data);
@@ -96,7 +96,7 @@ export class NormalBattleHandler {
} }
}, true); }, true);
let {status} = BattleRecord; let { status } = BattleRecord;
return resResult(STATUS.SUCCESS, { return resResult(STATUS.SUCCESS, {
@@ -105,17 +105,17 @@ export class NormalBattleHandler {
} }
// 关卡列表 // 关卡列表
async getBattleList(msg: {type: number }, session: BackendSession) { async getBattleList(msg: { type: number }, session: BackendSession) {
const { type } = msg; const { type } = msg;
let roleId = session.get('roleId'); let roleId = session.get('roleId');
let role = await RoleModel.findByRoleId(roleId); let role = await RoleModel.findByRoleId(roleId);
let {warStar} = role; let { warStar } = role;
let scripts = await RScriptRecordModel.findbyRole(roleId, type); let scripts = await RScriptRecordModel.findbyRole(roleId, type);
let result = []; // 去重 let result = []; // 去重
for(let {battleId, scriptBefore = '', scriptAfter = ''} of scripts) { for (let { battleId, scriptBefore = '', scriptAfter = '' } of scripts) {
result.push({ result.push({
battleId, battleId,
@@ -125,10 +125,10 @@ export class NormalBattleHandler {
scriptAfter scriptAfter
}); });
} }
for(let {id, star, warType} of warStar) { for (let { id, star, warType } of warStar) {
if(warType == type) { if (warType == type) {
let curResult = result.find(cur => cur.battleId == id); let curResult = result.find(cur => cur.battleId == id);
if(curResult) { if (curResult) {
curResult.status = 1; curResult.status = 1;
curResult.star = star; curResult.star = star;
} else { } else {
@@ -142,7 +142,7 @@ export class NormalBattleHandler {
} }
} }
} }
result = result.sort((a, b) => {return a.battleId - b.battleId}); result = result.sort((a, b) => { return a.battleId - b.battleId });
return resResult(STATUS.SUCCESS, { return resResult(STATUS.SUCCESS, {
list: result list: result
@@ -150,7 +150,7 @@ export class NormalBattleHandler {
} }
// 关卡结算，记录使用的武将，获得奖励 // 关卡结算，记录使用的武将，获得奖励
async battleEnd(msg: {battleCode: string, battleId: number, isSuccess: boolean, star: number, heroes: Array<any>, }, session: BackendSession) { async battleEnd(msg: { battleCode: string, battleId: number, isSuccess: boolean, star: number, heroes: Array<any>, }, session: BackendSession) {
const { battleCode, battleId, isSuccess, heroes = [], star } = msg; const { battleCode, battleId, isSuccess, heroes = [], star } = msg;
let roleId = session.get('roleId'); let roleId = session.get('roleId');
let roleName = session.get('roleName'); let roleName = session.get('roleName');
@@ -158,7 +158,7 @@ export class NormalBattleHandler {
const funcs: number[] = session.get('funcs'); const funcs: number[] = session.get('funcs');
let serverId = session.get('serverId'); let serverId = session.get('serverId');
let warInfo = gameData.war.get(battleId); let warInfo = gameData.war.get(battleId);
if(!warInfo) { if (!warInfo) {
return resResult(STATUS.BATTLE_MISS_INFO); return resResult(STATUS.BATTLE_MISS_INFO);
} }
// 寻宝不使用通用战斗模块结算 // 寻宝不使用通用战斗模块结算
@@ -167,22 +167,22 @@ export class NormalBattleHandler {
} }
const BattleRecord = await BattleRecordModel.getBattleRecordByCode(battleCode, true); const BattleRecord = await BattleRecordModel.getBattleRecordByCode(battleCode, true);
if(!BattleRecord || BattleRecord.status != 0) { if (!BattleRecord || BattleRecord.status != 0) {
return resResult(STATUS.BATTLE_STATUS_WRONG); return resResult(STATUS.BATTLE_STATUS_WRONG);
} }
let flag = 1; // 对比hero信息 let flag = 1; // 对比hero信息
let { record: { heroes: dbHeroes, seqIds: dbSeqIds } } = BattleRecord; let { record: { heroes: dbHeroes, seqIds: dbSeqIds } } = BattleRecord;
for(let seqId of dbSeqIds) { for (let seqId of dbSeqIds) {
if(dbSeqIds.indexOf(seqId) == -1) flag = 0; if (dbSeqIds.indexOf(seqId) == -1) flag = 0;
} }
if(!flag) { if (!flag) {
return resResult(STATUS.BATTLE_INFO_VALIDATE_ERR); return resResult(STATUS.BATTLE_INFO_VALIDATE_ERR);
} }
const now = Date.now(); // 当前时间戳 const now = Date.now(); // 当前时间戳
let apJson = await setAp(now, roleId, sid, funcs, -1 * warInfo.cost); // 扣除体力 let apJson = await setAp(now, roleId, sid, funcs, -1 * warInfo.cost); // 扣除体力
if(!apJson) { if (!apJson) {
return resResult(STATUS.BATTLE_ACTION_POINT_LACK); return resResult(STATUS.BATTLE_ACTION_POINT_LACK);
} }
@@ -192,9 +192,9 @@ export class NormalBattleHandler {
let towerStatus = null; let towerStatus = null;
let dungeonNum = {}; let dungeonNum = {};
if(warInfo.warType == WAR_TYPE.DAILY) { if (warInfo.warType == WAR_TYPE.DAILY) {
let checkResult = await checkDailyAndIncrease(roleId, battleId, 1, false); let checkResult = await checkDailyAndIncrease(roleId, battleId, 1, false);
if(checkResult.status == -1) { if (checkResult.status == -1) {
return checkResult.resResult; return checkResult.resResult;
} }
dailyNum = Object.assign(dailyNum, checkResult.data) dailyNum = Object.assign(dailyNum, checkResult.data)
@@ -203,53 +203,53 @@ export class NormalBattleHandler {
await setBattleStatus(session, roleId, battleId, isSuccess, battleCode); await setBattleStatus(session, roleId, battleId, isSuccess, battleCode);
} else if (warInfo.warType == WAR_TYPE.TOWER) { } else if (warInfo.warType == WAR_TYPE.TOWER) {
let towerEndResult = await towerBattleEnd(sid, funcs, roleId, serverId, battleCode, battleId, isSuccess, heroes); let towerEndResult = await towerBattleEnd(sid, funcs, roleId, serverId, battleCode, battleId, isSuccess, heroes);
if(towerEndResult) { if (towerEndResult) {
if(towerEndResult.status == -1) { if (towerEndResult.status == -1) {
return towerEndResult.resResult; return towerEndResult.resResult;
} }
towerStatus = towerEndResult.data.towerStatus; towerStatus = towerEndResult.data.towerStatus;
if(towerEndResult.data.towerReward) if (towerEndResult.data.towerReward)
warReward.setFixReward(towerEndResult.data.towerReward) warReward.setFixReward(towerEndResult.data.towerReward)
pushTowerMsg(roleId, roleName, serverId, MSG_SOURCE.TOWER_SUC, towerEndResult.data.newRec.lv); pushTowerMsg(roleId, roleName, serverId, MSG_SOURCE.TOWER_SUC, towerEndResult.data.newRec.lv);
} }
} else if (warInfo.warType == WAR_TYPE.MYSTERY || warInfo.warType == WAR_TYPE.MYSTERY_ELITE) { } else if (warInfo.warType == WAR_TYPE.MYSTERY || warInfo.warType == WAR_TYPE.MYSTERY_ELITE) {
let checkResult = await checkDungeonAndIncrease(roleId, 1, false); let checkResult = await checkDungeonAndIncrease(roleId, 1, false);
let role = await RoleModel.saveDungeonHero(roleId, battleId, heroes, isSuccess); let role = await RoleModel.saveDungeonHero(roleId, battleId, heroes, isSuccess);
if(role) { if (role) {
let r = new Rank(REDIS_KEY.DUNGEON_RANK, { serverId }); let r = new Rank(REDIS_KEY.DUNGEON_RANK, { serverId });
await r.setRankWithRoleInfo(roleId, role.dungeonWarId, role.dungeonUpdatedAt, role); await r.setRankWithRoleInfo(roleId, role.dungeonWarId, role.dungeonUpdatedAt, role);
} }
if(checkResult.status == -1) { if (checkResult.status == -1) {
return checkResult.resResult; return checkResult.resResult;
} }
dungeonNum = Object.assign(dungeonNum, checkResult.data) dungeonNum = Object.assign(dungeonNum, checkResult.data)
} else if (warInfo.warType == WAR_TYPE.NORMAL) { } else if (warInfo.warType == WAR_TYPE.NORMAL) {
let role = await RoleModel.updateMainWarId(roleId, battleId, nowSeconds()); let role = await RoleModel.updateMainWarId(roleId, battleId, nowSeconds());
if(role) { if (role) {
let r = new Rank(REDIS_KEY.MAIN_RANK, { serverId }); let r = new Rank(REDIS_KEY.MAIN_RANK, { serverId });
await r.setRankWithRoleInfo(roleId, role.mainWarId, role.mainUpdatedAt, role); await r.setRankWithRoleInfo(roleId, role.mainWarId, role.mainUpdatedAt, role);
} }
} else if (warInfo.warType == WAR_TYPE.MAIN_ELITE) { } else if (warInfo.warType == WAR_TYPE.MAIN_ELITE) {
let role = await RoleModel.updateMainEliteWarId(roleId, battleId, nowSeconds()); let role = await RoleModel.updateMainEliteWarId(roleId, battleId, nowSeconds());
if(role) { if (role) {
let r = new Rank(REDIS_KEY.MAIN_ELITE_RANK, { serverId }); let r = new Rank(REDIS_KEY.MAIN_ELITE_RANK, { serverId });
await r.setRankWithRoleInfo(roleId, role.mainEliteWarId, role.mainEliteUpdatedAt, role); await r.setRankWithRoleInfo(roleId, role.mainEliteWarId, role.mainEliteUpdatedAt, role);
} }
} }
if(isSuccess) { // 挑战胜利 if (isSuccess) { // 挑战胜利
// 是否首通 // 是否首通
let {warStar} = await RoleModel.findByRoleId(roleId); let { warStar } = await RoleModel.findByRoleId(roleId);
let condition1 = warStar.find(cur => cur.id == battleId); let condition1 = warStar.find(cur => cur.id == battleId);
if(!condition1) { if (!condition1) {
await switchOnFunc(roleId, FUNC_OPT_TYPE.BATTLE_END, battleId, session); await switchOnFunc(roleId, FUNC_OPT_TYPE.BATTLE_END, battleId, session);
warReward.setCondition(0, true); warReward.setCondition(0, true);
pushMysteryFirstMsg(roleId, roleName, serverId, warInfo.warType, warInfo.war_id); pushMysteryFirstMsg(roleId, roleName, serverId, warInfo.warType, warInfo.war_id);
pushVestigeFirstMsg(roleId, roleName, serverId, warInfo.warType, warInfo.war_id); pushVestigeFirstMsg(roleId, roleName, serverId, warInfo.warType, warInfo.war_id);
} }
// 是否首次3星 // 是否首次3星
if(star == 3 && (!condition1 || condition1.star != 3)) { if (star == 3 && (!condition1 || condition1.star != 3)) {
warReward.setCondition(1, true); warReward.setCondition(1, true);
} }
@@ -259,13 +259,13 @@ export class NormalBattleHandler {
let reward = await warReward.saveReward(1); let reward = await warReward.saveReward(1);
const updateResult = await BattleRecordModel.updateBattleRecordByCode(battleCode, { const updateResult = await BattleRecordModel.updateBattleRecordByCode(battleCode, {
$set: { status: isSuccess?1:2, star, record: { heroes } } $set: { status: isSuccess ? 1 : 2, star, record: { heroes } }
}, true); }, true);
let { status } = updateResult; let { status } = updateResult;
let actordata = await roleLevelup(roleId, isSuccess?warInfo.kingExp:0, session);// 主公升级经验 let actordata = await roleLevelup(roleId, isSuccess ? warInfo.kingExp : 0, session);// 主公升级经验
await checkTaskInBattleEnd(roleId, sid, funcs, battleId, dbHeroes, star); await checkTaskInBattleEnd(serverId, roleId, sid, funcs, battleId, dbHeroes, star);
// 返回值： // 返回值：
// towerStatus: false-本层未通过, true-本层已通过 // towerStatus: false-本层未通过, true-本层已通过
return resResult(STATUS.SUCCESS, { return resResult(STATUS.SUCCESS, {
@@ -277,7 +277,7 @@ export class NormalBattleHandler {
}); });
} }
async battleSweep(msg: {battleId: number, count: number }, session: BackendSession) { async battleSweep(msg: { battleId: number, count: number }, session: BackendSession) {
const { battleId, count } = msg; const { battleId, count } = msg;
let roleId = session.get('roleId'); let roleId = session.get('roleId');
@@ -285,35 +285,35 @@ export class NormalBattleHandler {
let sid = session.get('sid'); let sid = session.get('sid');
let funcs: number[] = session.get('funcs'); let funcs: number[] = session.get('funcs');
let warInfo = gameData.war.get(battleId); let warInfo = gameData.war.get(battleId);
if(!warInfo) { if (!warInfo) {
return resResult(STATUS.BATTLE_MISS_INFO); return resResult(STATUS.BATTLE_MISS_INFO);
} }
// 校验是否三星通关过 // 校验是否三星通关过
let { warStar } = await RoleModel.findByRoleId(roleId); let { warStar } = await RoleModel.findByRoleId(roleId);
let curWar = warStar.find(cur => cur.id == battleId); let curWar = warStar.find(cur => cur.id == battleId);
if(!curWar || curWar.star != 3) { if (!curWar || curWar.star != 3) {
return resResult(STATUS.BATTLE_SWEEP_CONDITION_STAR); return resResult(STATUS.BATTLE_SWEEP_CONDITION_STAR);
} }
// 扣体力 // 扣体力
const now = Date.now(); // 当前时间戳 const now = Date.now(); // 当前时间戳
let apJson = await setAp(now, roleId, sid, funcs, -1 * warInfo.cost * count); // 扣除体力 let apJson = await setAp(now, roleId, sid, funcs, -1 * warInfo.cost * count); // 扣除体力
if(!apJson) { if (!apJson) {
return resResult(STATUS.BATTLE_ACTION_POINT_LACK); return resResult(STATUS.BATTLE_ACTION_POINT_LACK);
} }
// 扫荡次数 // 扫荡次数
let dailyNum = {}; let dailyNum = {};
let dungeonNum = {}; let dungeonNum = {};
if(warInfo.warType == WAR_TYPE.DAILY) { if (warInfo.warType == WAR_TYPE.DAILY) {
let checkResult = await checkDailyAndIncrease(roleId, battleId, count, true); let checkResult = await checkDailyAndIncrease(roleId, battleId, count, true);
if(checkResult.status == -1) { if (checkResult.status == -1) {
return checkResult.resResult return checkResult.resResult
} }
dailyNum = Object.assign(dailyNum, checkResult.data) dailyNum = Object.assign(dailyNum, checkResult.data)
} else if(warInfo.warType == WAR_TYPE.MYSTERY|| warInfo.warType == WAR_TYPE.MYSTERY_ELITE) { } else if (warInfo.warType == WAR_TYPE.MYSTERY || warInfo.warType == WAR_TYPE.MYSTERY_ELITE) {
let checkResult = await checkDungeonAndIncrease(roleId, count, true); let checkResult = await checkDungeonAndIncrease(roleId, count, true);
if(checkResult.status == -1) { if (checkResult.status == -1) {
return checkResult.resResult return checkResult.resResult
} }
dungeonNum = Object.assign(dungeonNum, checkResult.data) dungeonNum = Object.assign(dungeonNum, checkResult.data)
@@ -339,23 +339,23 @@ export class NormalBattleHandler {
await checkTaskWithWar(roleId, sid, funcs, TASK_TYPE.BATTLE_MAIN_SWEEP, battleId, [], count, 0); await checkTaskWithWar(roleId, sid, funcs, TASK_TYPE.BATTLE_MAIN_SWEEP, battleId, [], count, 0);
return resResult(STATUS.SUCCESS, { return resResult(STATUS.SUCCESS, {
battleId, count, battleId, count,
battleGoods: result, battleGoods: result,
apJson, apJson,
dailyNum, dungeonNum, dailyNum, dungeonNum,
...actordata ...actordata
}); });
} }
async saveScript(msg: {battleId: number, type: number, script: string }, session: BackendSession) { async saveScript(msg: { battleId: number, type: number, script: string }, session: BackendSession) {
const { battleId, type, script } = msg; const { battleId, type, script } = msg;
let roleId = session.get('roleId'); let roleId = session.get('roleId');
let warInfo = gameData.war.get(battleId); let warInfo = gameData.war.get(battleId);
let result = await RScriptRecordModel.setScript(roleId, battleId, warInfo.warType, type, script); let result = await RScriptRecordModel.setScript(roleId, battleId, warInfo.warType, type, script);
if(result) { if (result) {
if(!result.scriptBefore) result.scriptBefore = ''; if (!result.scriptBefore) result.scriptBefore = '';
if(!result.scriptAfter) result.scriptAfter = ''; if (!result.scriptAfter) result.scriptAfter = '';
return resResult(STATUS.SUCCESS, result); return resResult(STATUS.SUCCESS, result);
} else { } else {
console.error('script not created'); console.error('script not created');
@@ -364,19 +364,19 @@ export class NormalBattleHandler {
} }
async getScriptByBattle(msg: {battleIds: Array<number> }, session: BackendSession) { async getScriptByBattle(msg: { battleIds: Array<number> }, session: BackendSession) {
const { battleIds } = msg; const { battleIds } = msg;
let roleId = session.get('roleId'); let roleId = session.get('roleId');
let list = new Array(); let list = new Array();
for(let battleId of battleIds) { for (let battleId of battleIds) {
let result = await RScriptRecordModel.findbyRoleAndBattle(roleId, battleId); let result = await RScriptRecordModel.findbyRoleAndBattle(roleId, battleId);
if(result) { if (result) {
let {scriptBefore = '', scriptAfter = ''} = result; let { scriptBefore = '', scriptAfter = '' } = result;
list.push({battleId, scriptBefore, scriptAfter}); list.push({ battleId, scriptBefore, scriptAfter });
} else { } else {
list.push({battleId, scriptBefore: '', scriptAfter: ''}); list.push({ battleId, scriptBefore: '', scriptAfter: '' });
} }
} }
return resResult(STATUS.SUCCESS, { list }); return resResult(STATUS.SUCCESS, { list });
game-server/app/servers/connector/handler/entryHandler.ts
+3 -3
View File
@@ -103,7 +103,7 @@ export class EntryHandler {
let items = await ItemModel.findbyRole(role.roleId); let items = await ItemModel.findbyRole(role.roleId);
let mails = await getMails(role.roleId, serverId) let mails = await getMails(role.roleId, serverId)
await chackFunOpenWhenLogin(role, session); await chackFunOpenWhenLogin(role, session);
if(role.hasInit) await loginRefresh(role.roleId); if (role.hasInit) await loginRefresh(role.roleId);
reportOneOnline(role.roleId, user.userCode, self.app.get('serverId'), user.pkgName); reportOneOnline(role.roleId, user.userCode, self.app.get('serverId'), user.pkgName);
let r = new Rank(REDIS_KEY.HERO_NUM_RANK, { serverId }); let r = new Rank(REDIS_KEY.HERO_NUM_RANK, { serverId });
@@ -112,8 +112,8 @@ export class EntryHandler {
r2.setRankWithRoleInfo(role.roleId, role.lv, role.updatedAt.getTime(), role); r2.setRankWithRoleInfo(role.roleId, role.lv, role.updatedAt.getTime(), role);
// 任务 // 任务
checkTaskWithRole(role.roleId, self.app.get('serverId'), role.funcs, TASK_TYPE.LOGIN_SUM, role); checkTaskWithRole(serverId, role.roleId, self.app.get('serverId'), role.funcs, TASK_TYPE.LOGIN_SUM, role);
checkTaskWithRole(role.roleId, self.app.get('serverId'), role.funcs, TASK_TYPE.LOGIN_SERIES, role); checkTaskWithRole(serverId, role.roleId, self.app.get('serverId'), role.funcs, TASK_TYPE.LOGIN_SERIES, role);
role['heros'] = heros; role['heros'] = heros;
role['equips'] = equips; role['equips'] = equips;
game-server/app/servers/guild/handler/cityActivityHandler.ts
+1 -1
View File
@@ -295,7 +295,7 @@ export class CityActivityHandler {
// 任务 // 任务
await checkTask(roleId, sid, funcs, TASK_TYPE.GUILD_ACTIVITY, 1, true, { aid: this.aid }); await checkTask(roleId, sid, funcs, TASK_TYPE.GUILD_ACTIVITY, 1, true, { aid: this.aid });
//成长任务 //成长任务
await accomplishTask(roleId, TASK_TYPE.GUILD_ACTIVITY, 1, { aid: this.aid }) await accomplishTask(serverId, roleId, TASK_TYPE.GUILD_ACTIVITY, 1, { aid: this.aid })
return resResult(STATUS.SUCCESS, { return resResult(STATUS.SUCCESS, {
isSuccess, isSuccess,
game-server/app/servers/guild/handler/gateActivityHandler.ts
+1 -1
View File
@@ -259,7 +259,7 @@ export class GateActivityHandler {
// 任务 // 任务
await checkTask(roleId, sid, funcs, TASK_TYPE.GUILD_ACTIVITY, 1, true, { aid: this.aid }); await checkTask(roleId, sid, funcs, TASK_TYPE.GUILD_ACTIVITY, 1, true, { aid: this.aid });
//成长任务 //成长任务
await accomplishTask(roleId, TASK_TYPE.GUILD_ACTIVITY, 1, { aid: this.aid }) await accomplishTask(serverId, roleId, TASK_TYPE.GUILD_ACTIVITY, 1, { aid: this.aid })
return resResult(STATUS.SUCCESS, { return resResult(STATUS.SUCCESS, {
code, code,
...statusResult, ...statusResult,
game-server/app/servers/guild/handler/raceActivityHandler.ts
+1 -1
View File
@@ -179,7 +179,7 @@ export class RaceActivityHandler {
// 任务 // 任务
await checkTask(roleId, sid, funcs, TASK_TYPE.GUILD_ACTIVITY, 1, true, { aid: this.aid }); await checkTask(roleId, sid, funcs, TASK_TYPE.GUILD_ACTIVITY, 1, true, { aid: this.aid });
//成长任务 //成长任务
await accomplishTask(roleId, TASK_TYPE.GUILD_ACTIVITY, 1, { aid: this.aid }) await accomplishTask(serverId, roleId, TASK_TYPE.GUILD_ACTIVITY, 1, { aid: this.aid })
return resResult(STATUS.SUCCESS, { return resResult(STATUS.SUCCESS, {
timestamp: Date.now(), timestamp: Date.now(),
woodenHorse: guildActivityRec.woodenHorse, woodenHorse: guildActivityRec.woodenHorse,
game-server/app/servers/role/handler/equipHandler.ts
+15 -11
View File
@@ -92,6 +92,7 @@ export class EquipHandler {
public async strengthen(msg: { hid: number, ePlaceId: number, type: number }, session: BackendSession) { public async strengthen(msg: { hid: number, ePlaceId: number, type: number }, session: BackendSession) {
let roleId: string = session.get('roleId'); let roleId: string = session.get('roleId');
// let roleName: string = session.get('roleName'); // let roleName: string = session.get('roleName');
const serverId = session.get('serverId');
let sid: string = session.get('sid'); let sid: string = session.get('sid');
let funcs: number[] = session.get('funcs'); let funcs: number[] = session.get('funcs');
@@ -167,7 +168,7 @@ export class EquipHandler {
// 任务 // 任务
await checkTaskWithHero(roleId, sid, funcs, TASK_TYPE.EQUIP_STRENGTHEN, hero, oldLvs); await checkTaskWithHero(roleId, sid, funcs, TASK_TYPE.EQUIP_STRENGTHEN, hero, oldLvs);
//成长任务 //成长任务
await accomplishTask(roleId, TASK_TYPE.EQUIP_STRENGTHEN, 1, changeData) await accomplishTask(serverId, roleId, TASK_TYPE.EQUIP_STRENGTHEN, 1, changeData)
const curHero = { const curHero = {
hid, hid,
@@ -183,6 +184,7 @@ export class EquipHandler {
// let roleName: string = session.get('roleName'); // let roleName: string = session.get('roleName');
let sid: string = session.get('sid'); let sid: string = session.get('sid');
let funcs: number[] = session.get('funcs'); let funcs: number[] = session.get('funcs');
const serverId = session.get('serverId');
let changeData = [];//变化的等级数据 let changeData = [];//变化的等级数据
let { hid, lv: maxLv } = msg; // lv: 升到哪一级 let { hid, lv: maxLv } = msg; // lv: 升到哪一级
@@ -248,7 +250,7 @@ export class EquipHandler {
// 任务 // 任务
await checkTaskWithHero(roleId, sid, funcs, TASK_TYPE.EQUIP_STRENGTHEN, hero, oldLvs); await checkTaskWithHero(roleId, sid, funcs, TASK_TYPE.EQUIP_STRENGTHEN, hero, oldLvs);
//成长任务 //成长任务
await accomplishTask(roleId, TASK_TYPE.EQUIP_STRENGTHEN, 1, changeData) await accomplishTask(serverId, roleId, TASK_TYPE.EQUIP_STRENGTHEN, 1, changeData)
const curHero = { const curHero = {
hid, hid,
@@ -326,7 +328,7 @@ export class EquipHandler {
let curEquip = <EquipType>equip; let curEquip = <EquipType>equip;
pushEquipRefineSucMsg(roleId, roleName, serverId, curEplace, curEquip ? curEquip.quality : 0); pushEquipRefineSucMsg(roleId, roleName, serverId, curEplace, curEquip ? curEquip.quality : 0);
await checkTask(roleId, sid, funcs, TASK_TYPE.EQUIP_REFINE, 1, true, {}); await checkTask(roleId, sid, funcs, TASK_TYPE.EQUIP_REFINE, 1, true, {});
await accomplishTask(roleId, TASK_TYPE.EQUIP_REFINE_LV, 1, { lv: curEplace.refineLv }); await accomplishTask(serverId, roleId, TASK_TYPE.EQUIP_REFINE_LV, 1, { lv: curEplace.refineLv });
} }
return resResult(STATUS.SUCCESS, { isSuccess, curHero }); return resResult(STATUS.SUCCESS, { isSuccess, curHero });
} }
@@ -479,6 +481,7 @@ export class EquipHandler {
public async putOnOrOff(msg: { eid: number, hid: number, type: number }, session: BackendSession) { public async putOnOrOff(msg: { eid: number, hid: number, type: number }, session: BackendSession) {
let { eid, hid, type } = msg; let { eid, hid, type } = msg;
let roleId: string = session.get('roleId'); let roleId: string = session.get('roleId');
const serverId = session.get('serverId');
let equip = await EquipModel.getEquip(eid); let equip = await EquipModel.getEquip(eid);
let sid: string = session.get('sid'); let sid: string = session.get('sid');
let funcs: number[] = session.get('funcs'); let funcs: number[] = session.get('funcs');
@@ -503,10 +506,10 @@ export class EquipHandler {
if (index < 0) if (index < 0)
return resResult(STATUS.WRONG_PARMS); return resResult(STATUS.WRONG_PARMS);
let equipOffInfo = <EquipType>hero.ePlace[index].equip; let equipOffInfo = <EquipType>hero.ePlace[index].equip;
let curEquip = await changeEquip(roleId, sid, equipOffInfo, equip.hid, id, equip, funcs); let curEquip = await changeEquip(serverId, roleId, sid, equipOffInfo, equip.hid, id, equip, funcs);
if (!!curEquip) if (!!curEquip)
curEquips.push(curEquip); curEquips.push(curEquip);
curEquip = await dressEquip(roleId, sid, hero, equip, funcs); curEquip = await dressEquip(serverId, roleId, sid, hero, equip, funcs);
if (!!curEquip) if (!!curEquip)
curEquips.push(curEquip); curEquips.push(curEquip);
@@ -514,7 +517,7 @@ export class EquipHandler {
//英雄满装备且都镶嵌相同阶数的宝石 //英雄满装备且都镶嵌相同阶数的宝石
let { isTask, jewelLevel } = await checkTaskConditionEquipSuitJewelStage(hero) let { isTask, jewelLevel } = await checkTaskConditionEquipSuitJewelStage(hero)
if (isTask) { if (isTask) {
await accomplishTask(roleId, TASK_TYPE.EQUIP_SUIT_JEWEL_STAGE, 1, { stage: jewelLevel }) await accomplishTask(serverId, roleId, TASK_TYPE.EQUIP_SUIT_JEWEL_STAGE, 1, { stage: jewelLevel })
} }
} else if (type == 2) { } else if (type == 2) {
if (!equip.hid) if (!equip.hid)
@@ -557,6 +560,7 @@ export class EquipHandler {
public async fillHole(msg: { eid: number, id: number, jewel: number }, session: BackendSession) { public async fillHole(msg: { eid: number, id: number, jewel: number }, session: BackendSession) {
let { eid, id, jewel } = msg; let { eid, id, jewel } = msg;
let roleId: string = session.get('roleId'); let roleId: string = session.get('roleId');
const serverId = session.get('serverId');
let sid: string = session.get('sid'); let sid: string = session.get('sid');
let funcs: number[] = session.get('funcs'); let funcs: number[] = session.get('funcs');
let consumes: Array<{ id: number, count: number }> = []; let consumes: Array<{ id: number, count: number }> = [];
@@ -593,7 +597,7 @@ export class EquipHandler {
//英雄满装备且都镶嵌相同阶数的宝石 //英雄满装备且都镶嵌相同阶数的宝石
let { isTask, jewelLevel } = await checkTaskConditionEquipSuitJewelStage(hero) let { isTask, jewelLevel } = await checkTaskConditionEquipSuitJewelStage(hero)
if (isTask) { if (isTask) {
await accomplishTask(roleId, TASK_TYPE.EQUIP_SUIT_JEWEL_STAGE, 1, { stage: jewelLevel }) await accomplishTask(serverId, roleId, TASK_TYPE.EQUIP_SUIT_JEWEL_STAGE, 1, { stage: jewelLevel })
} }
} }
@@ -602,8 +606,8 @@ export class EquipHandler {
await checkTaskWithArgs(roleId, sid, funcs, TASK_TYPE.EQUIP_JEWEL_STAGE, [jewel, oldJewel]); await checkTaskWithArgs(roleId, sid, funcs, TASK_TYPE.EQUIP_JEWEL_STAGE, [jewel, oldJewel]);
await checkTaskWithEquip(roleId, sid, funcs, TASK_TYPE.EQUIP_JEWEL_SUM, equip, [oldJewelCount]); await checkTaskWithEquip(roleId, sid, funcs, TASK_TYPE.EQUIP_JEWEL_SUM, equip, [oldJewelCount]);
//成长任务 //成长任务
await accomplishTask(roleId, TASK_TYPE.EQUIP_JEWEL_SUM, 1) await accomplishTask(serverId, roleId, TASK_TYPE.EQUIP_JEWEL_SUM, 1)
await accomplishTask(roleId, TASK_TYPE.EQUIP_JEWEL_STAGE, 1) await accomplishTask(serverId, roleId, TASK_TYPE.EQUIP_JEWEL_STAGE, 1)
return resResult(STATUS.SUCCESS, { curEquip: { seqId: eid, holes: equip.holes } }); return resResult(STATUS.SUCCESS, { curEquip: { seqId: eid, holes: equip.holes } });
} }
@@ -773,7 +777,7 @@ export class EquipHandler {
//英雄满装备且都镶嵌相同阶数的宝石 //英雄满装备且都镶嵌相同阶数的宝石
let { isTask, jewelLevel } = await checkTaskConditionEquipSuitJewelStage(hero) let { isTask, jewelLevel } = await checkTaskConditionEquipSuitJewelStage(hero)
if (isTask) { if (isTask) {
await accomplishTask(roleId, TASK_TYPE.EQUIP_SUIT_JEWEL_STAGE, 1, { stage: jewelLevel }) await accomplishTask(serverId, roleId, TASK_TYPE.EQUIP_SUIT_JEWEL_STAGE, 1, { stage: jewelLevel })
} }
} }
@@ -782,7 +786,7 @@ export class EquipHandler {
await checkTaskWithArgs(roleId, sid, funcs, TASK_TYPE.EQUIP_JEWEL_STAGE, [jewel, oldJewel]); await checkTaskWithArgs(roleId, sid, funcs, TASK_TYPE.EQUIP_JEWEL_STAGE, [jewel, oldJewel]);
await checkTaskWithEquip(roleId, sid, funcs, TASK_TYPE.EQUIP_JEWEL_SUM, equip, [oldJewelCount]); await checkTaskWithEquip(roleId, sid, funcs, TASK_TYPE.EQUIP_JEWEL_SUM, equip, [oldJewelCount]);
//成长任务 //成长任务
await accomplishTask(roleId, TASK_TYPE.EQUIP_JEWEL_SUM, count) await accomplishTask(serverId, roleId, TASK_TYPE.EQUIP_JEWEL_SUM, count)
return resResult(STATUS.SUCCESS, { curEquip: { seqId: eid, holes: equip.holes } }); return resResult(STATUS.SUCCESS, { curEquip: { seqId: eid, holes: equip.holes } });
} else { } else {
game-server/app/servers/role/handler/friendHandler.ts
+107 -105
View File
@@ -37,7 +37,7 @@ export class FriendHandler {
} }
// 获取推荐好友列表 // 获取推荐好友列表
public async getRecommend(msg: { }, session: BackendSession) { public async getRecommend(msg: {}, session: BackendSession) {
let roleId: string = session.get('roleId'); let roleId: string = session.get('roleId');
const day = <number>getTimeFun().getBeforeHour(FRIEND.FRIEND_RECONMMEND_ACTIVETIME); const day = <number>getTimeFun().getBeforeHour(FRIEND.FRIEND_RECONMMEND_ACTIVETIME);
@@ -55,17 +55,17 @@ export class FriendHandler {
let myServerList = new Array<FriendRecommendParams>(); let myServerList = new Array<FriendRecommendParams>();
let otherServerList = new Array<FriendRecommendParams>(); let otherServerList = new Array<FriendRecommendParams>();
for(let role of allList) { for (let role of allList) {
let type = getRecommendType(myFriendRelation, roleId, role.roleId); let type = getRecommendType(myFriendRelation, roleId, role.roleId);
if(type == FRIEND_RELATION_TYPE.NORMAL) { if (type == FRIEND_RELATION_TYPE.NORMAL) {
let param = new FriendRecommendParams(role); let param = new FriendRecommendParams(role);
param.setType(type); param.setType(type);
let { serverId, userInfo: { serverType }} = role; let { serverId, userInfo: { serverType } } = role;
let serverName = await getServerName(serverType, serverId); let serverName = await getServerName(serverType, serverId);
param.setServerName(serverId, serverName); param.setServerName(serverId, serverName);
if(myServerId == serverId && myServerType == serverType ) { if (myServerId == serverId && myServerType == serverType) {
myServerList.push(param); myServerList.push(param);
} else { } else {
otherServerList.push(param); otherServerList.push(param);
@@ -75,14 +75,14 @@ export class FriendHandler {
} }
// 前4个是本服的，后4个随意，优先本服，其他补上 // 前4个是本服的，后4个随意，优先本服，其他补上
let myServerLen = myServerList.length > FRIEND.FRIEND_RECONMMEND_SERVICE? FRIEND.FRIEND_RECONMMEND_SERVICE: myServerList.length; let myServerLen = myServerList.length > FRIEND.FRIEND_RECONMMEND_SERVICE ? FRIEND.FRIEND_RECONMMEND_SERVICE : myServerList.length;
let list1:FriendRecommendParams[] = getRandEelm(myServerList, myServerLen); let list1: FriendRecommendParams[] = getRandEelm(myServerList, myServerLen);
let otherServerLen = otherServerList.length > FRIEND.FRIEND_RECONMMEND_NUM - myServerLen? FRIEND.FRIEND_RECONMMEND_NUM - myServerLen: otherServerList.length; let otherServerLen = otherServerList.length > FRIEND.FRIEND_RECONMMEND_NUM - myServerLen ? FRIEND.FRIEND_RECONMMEND_NUM - myServerLen : otherServerList.length;
let list2:FriendRecommendParams[] = getRandEelm(otherServerList, otherServerLen); let list2: FriendRecommendParams[] = getRandEelm(otherServerList, otherServerLen);
if(list2.length < FRIEND.FRIEND_RECONMMEND_NUM - myServerLen) { if (list2.length < FRIEND.FRIEND_RECONMMEND_NUM - myServerLen) {
if(myServerList.length <= FRIEND.FRIEND_RECONMMEND_NUM - list2.length) { if (myServerList.length <= FRIEND.FRIEND_RECONMMEND_NUM - list2.length) {
list1 = myServerList; list1 = myServerList;
} else { } else {
list1 = getRandEelm(myServerList, FRIEND.FRIEND_RECONMMEND_NUM - list2.length); list1 = getRandEelm(myServerList, FRIEND.FRIEND_RECONMMEND_NUM - list2.length);
@@ -105,12 +105,12 @@ export class FriendHandler {
let myFriendRelation = await FriendRelationModel.findFriendByRole(roleId, POPULATE_TYPE.NOT); let myFriendRelation = await FriendRelationModel.findFriendByRole(roleId, POPULATE_TYPE.NOT);
let list = new Array<FriendRecommendParams>(); let list = new Array<FriendRecommendParams>();
for(let role of allList) { for (let role of allList) {
let type = getRecommendType(myFriendRelation, roleId, role.roleId); let type = getRecommendType(myFriendRelation, roleId, role.roleId);
let param = new FriendRecommendParams(role); let param = new FriendRecommendParams(role);
param.setType(type); param.setType(type);
let { serverId, userInfo: { serverType }} = role; let { serverId, userInfo: { serverType } } = role;
let serverName = await getServerName(serverType, serverId); let serverName = await getServerName(serverType, serverId);
param.setServerName(serverId, serverName); param.setServerName(serverId, serverName);
@@ -131,25 +131,25 @@ export class FriendHandler {
let str = '', resultRoleIds = new Array<string>(); let str = '', resultRoleIds = new Array<string>();
let uids = []; let uids = [];
for(let hisRoleId of roleIds) { for (let hisRoleId of roleIds) {
let type = getRecommendType(myFriendRelation, roleId, hisRoleId); let type = getRecommendType(myFriendRelation, roleId, hisRoleId);
if(type == FRIEND_RELATION_TYPE.HAS_FRIEND) { if (type == FRIEND_RELATION_TYPE.HAS_FRIEND) {
str = getResStr(STATUS.FRIEND_HAS_ADD); continue; str = getResStr(STATUS.FRIEND_HAS_ADD); continue;
} else if(type == FRIEND_RELATION_TYPE.HAS_BLOCKED) { } else if (type == FRIEND_RELATION_TYPE.HAS_BLOCKED) {
str = getResStr(STATUS.FRIEND_HAS_BLOCKED); continue; str = getResStr(STATUS.FRIEND_HAS_BLOCKED); continue;
} else if (type == FRIEND_RELATION_TYPE.MYSELF) { } else if (type == FRIEND_RELATION_TYPE.MYSELF) {
str = getResStr(STATUS.FRIEND_YOURSELF); continue; str = getResStr(STATUS.FRIEND_YOURSELF); continue;
} }
let incResult = await RoleModel.increaseFriendApplyCnt(hisRoleId, 1, FRIEND.FRIEND_MANAGE_APPLICATION); let incResult = await RoleModel.increaseFriendApplyCnt(hisRoleId, 1, FRIEND.FRIEND_MANAGE_APPLICATION);
if(!incResult) { if (!incResult) {
str = getResStr(STATUS.FRIEND_HIS_APPLY_MAX); continue; str = getResStr(STATUS.FRIEND_HIS_APPLY_MAX); continue;
} }
await FriendApplyModel.createApply(hisRoleId, role); await FriendApplyModel.createApply(hisRoleId, role);
resultRoleIds.push(hisRoleId); resultRoleIds.push(hisRoleId);
let hisOnlineInfo = await getRoleOnlineInfo(hisRoleId); let hisOnlineInfo = await getRoleOnlineInfo(hisRoleId);
if(hisOnlineInfo.isOnline) { if (hisOnlineInfo.isOnline) {
uids.push({ uid: hisRoleId, sid: hisOnlineInfo.sid }); uids.push({ uid: hisRoleId, sid: hisOnlineInfo.sid });
} }
} }
@@ -164,7 +164,7 @@ export class FriendHandler {
} }
// 获取申请列表 // 获取申请列表
public async getApplyList(msg: { }, session: BackendSession) { public async getApplyList(msg: {}, session: BackendSession) {
let roleId: string = session.get('roleId'); let roleId: string = session.get('roleId');
@@ -172,18 +172,18 @@ export class FriendHandler {
let list = await FriendApplyModel.getApplyList(roleId); let list = await FriendApplyModel.getApplyList(roleId);
let result = new Array<FriendApplyParams>(); let result = new Array<FriendApplyParams>();
let delApplyCodeList = new Array<string>(); let delApplyCodeList = new Array<string>();
for(let apply of list) { for (let apply of list) {
let friend = <RoleType>apply.friend; let friend = <RoleType>apply.friend;
let type = getRecommendType(myFriendRelation, roleId, friend.roleId); let type = getRecommendType(myFriendRelation, roleId, friend.roleId);
let param = new FriendApplyParams(apply.applyCode, friend); let param = new FriendApplyParams(apply.applyCode, friend);
let { serverId, userInfo: { serverType }} = friend; let { serverId, userInfo: { serverType } } = friend;
let serverName = await getServerName(serverType, serverId); let serverName = await getServerName(serverType, serverId);
param.setServerName(serverId, serverName); param.setServerName(serverId, serverName);
param.setType(type); param.setType(type);
if(type != FRIEND_RELATION_TYPE.NORMAL) { if (type != FRIEND_RELATION_TYPE.NORMAL) {
delApplyCodeList.push(apply.applyCode); delApplyCodeList.push(apply.applyCode);
continue; continue;
} }
@@ -203,6 +203,7 @@ export class FriendHandler {
let roleId: string = session.get('roleId'); let roleId: string = session.get('roleId');
let sid: string = session.get('sid'); let sid: string = session.get('sid');
let funcs: number[] = session.get('funcs'); let funcs: number[] = session.get('funcs');
const serverId = session.get('serverId');
let { applyCodeList, isPass } = msg; let { applyCodeList, isPass } = msg;
@@ -216,13 +217,13 @@ export class FriendHandler {
let list = new Array<FriendListParam>(); let list = new Array<FriendListParam>();
let str = '', resultApplyCodeList = new Array<string>(); let str = '', resultApplyCodeList = new Array<string>();
if(isPass) { if (isPass) {
for(let apply of applyList) { for (let apply of applyList) {
let type = getRecommendType(myFriendRelation, roleId, apply.frdRoleId); let type = getRecommendType(myFriendRelation, roleId, apply.frdRoleId);
if(type == FRIEND_RELATION_TYPE.HAS_FRIEND) { if (type == FRIEND_RELATION_TYPE.HAS_FRIEND) {
str = getResStr(STATUS.FRIEND_HAS_ADD); str = getResStr(STATUS.FRIEND_HAS_ADD);
resultApplyCodeList.push(apply.applyCode); continue; resultApplyCodeList.push(apply.applyCode); continue;
} else if(type == FRIEND_RELATION_TYPE.HAS_BLOCKED) { } else if (type == FRIEND_RELATION_TYPE.HAS_BLOCKED) {
resultApplyCodeList.push(apply.applyCode); resultApplyCodeList.push(apply.applyCode);
str = getResStr(STATUS.FRIEND_HAS_BLOCKED); continue; str = getResStr(STATUS.FRIEND_HAS_BLOCKED); continue;
} else if (type == FRIEND_RELATION_TYPE.MYSELF) { } else if (type == FRIEND_RELATION_TYPE.MYSELF) {
@@ -233,12 +234,12 @@ export class FriendHandler {
// 好友数量校验 // 好友数量校验
let friend = <RoleType>apply.friend; let friend = <RoleType>apply.friend;
str = await increaseFrdCnt(role, friend, friendCnt); str = await increaseFrdCnt(role, friend, friendCnt);
if(str != '') continue; if (str != '') continue;
roles.push(friend); roles.push(friend);
// 创建friendShip // 创建friendShip
let friendShip = await FriendShipModel.createFriendShip([roleId, friend.roleId]); let friendShip = await FriendShipModel.createFriendShip([roleId, friend.roleId]);
if(!friendShip) { if (!friendShip) {
str = getResStr(STATUS.FRIEND_SHIP_CREATE_ERROR); continue; str = getResStr(STATUS.FRIEND_SHIP_CREATE_ERROR); continue;
} }
@@ -249,7 +250,7 @@ export class FriendHandler {
let isOnline = await isRoleOnline(friend.roleId); let isOnline = await isRoleOnline(friend.roleId);
param.setOnline(isOnline); param.setOnline(isOnline);
let { serverId, userInfo: { serverType }} = friend; let { serverId, userInfo: { serverType } } = friend;
let serverName = await getServerName(serverType, serverId); let serverName = await getServerName(serverType, serverId);
param.setServerName(serverId, serverName); param.setServerName(serverId, serverName);
@@ -265,10 +266,10 @@ export class FriendHandler {
role = await RoleModel.increaseFriendApplyCnt(roleId, -1 * resultApplyCodeList.length, 50); role = await RoleModel.increaseFriendApplyCnt(roleId, -1 * resultApplyCodeList.length, 50);
roles.push(role); roles.push(role);
// 任务 // 任务
await checkTaskWithRoles(roleId, sid, funcs, TASK_TYPE.FRIEND_NUM, roles); await checkTaskWithRoles(serverId, roleId, sid, funcs, TASK_TYPE.FRIEND_NUM, roles);
// 特殊处理：如果他点一键同意，有很多人，这个单独的人就不做这个额外的提示，直接把他好友申请删掉就好 // 特殊处理：如果他点一键同意，有很多人，这个单独的人就不做这个额外的提示，直接把他好友申请删掉就好
if(str == getResStr(STATUS.FRIEND_HAS_ADD) && resultApplyCodeList.length > 1) str = ''; if (str == getResStr(STATUS.FRIEND_HAS_ADD) && resultApplyCodeList.length > 1) str = '';
return resResult(STATUS.SUCCESS, { return resResult(STATUS.SUCCESS, {
isSuccess: str == '', isSuccess: str == '',
@@ -280,27 +281,27 @@ export class FriendHandler {
} }
// 获取好友列表 // 获取好友列表
public async getFriendList(msg: { }, session: BackendSession) { public async getFriendList(msg: {}, session: BackendSession) {
let roleId: string = session.get('roleId'); let roleId: string = session.get('roleId');
let role = await RoleModel.findByRoleId(roleId); let role = await RoleModel.findByRoleId(roleId);
let list = new Array<FriendListParam>(); let list = new Array<FriendListParam>();
let myRelation = await FriendRelationModel.findFriendByRole(roleId, POPULATE_TYPE.FRIEND); let myRelation = await FriendRelationModel.findFriendByRole(roleId, POPULATE_TYPE.FRIEND);
let friendList = myRelation?myRelation.friends: []; let friendList = myRelation ? myRelation.friends : [];
for(let friend of friendList) { for (let friend of friendList) {
let friendRole = <RoleType>friend.role; let friendRole = <RoleType>friend.role;
let friendShip = <FriendShipType>friend.friendShip; let friendShip = <FriendShipType>friend.friendShip;
if(!friendRole || !friendShip) continue; if (!friendRole || !friendShip) continue;
let fs = <FriendShipType>friend.friendShip; let fs = <FriendShipType>friend.friendShip;
let ref = shouldRefresh(fs.refTime, new Date()); let ref = shouldRefresh(fs.refTime, new Date());
if(ref) { if (ref) {
friendShip = await FriendShipModel.refreshSendAndReceive(roleId, friendRole.roleId); friendShip = await FriendShipModel.refreshSendAndReceive(roleId, friendRole.roleId);
} }
let param = new FriendListParam(friendRole, roleId, friendShip); let param = new FriendListParam(friendRole, roleId, friendShip);
let { serverId, userInfo: { serverType }} = friendRole; let { serverId, userInfo: { serverType } } = friendRole;
let serverName = await getServerName(serverType, serverId); let serverName = await getServerName(serverType, serverId);
param.setServerName(serverId, serverName); param.setServerName(serverId, serverName);
@@ -313,10 +314,10 @@ export class FriendHandler {
} }
list.sort((a, b) => { list.sort((a, b) => {
if(a.isOnline != b.isOnline) { if (a.isOnline != b.isOnline) {
return a.isOnline?1:-1 return a.isOnline ? 1 : -1
} }
if(a.quitTime != b.quitTime) { if (a.quitTime != b.quitTime) {
return b.quitTime - a.quitTime return b.quitTime - a.quitTime
} }
return a.friendValue - b.friendValue; return a.friendValue - b.friendValue;
@@ -324,7 +325,7 @@ export class FriendHandler {
let { friendCnt = 0, blockCnt = 0 } = role; let { friendCnt = 0, blockCnt = 0 } = role;
let frdPointRec = await FriendPointModel.getFrdPointRecToday(roleId, FRIEND_DROP_TYPE.SEND_GIFT); let frdPointRec = await FriendPointModel.getFrdPointRecToday(roleId, FRIEND_DROP_TYPE.SEND_GIFT);
let { cnt: todayReceiveCnt = 0, sendCnt: todaySendCnt = 0 } = frdPointRec||{}; let { cnt: todayReceiveCnt = 0, sendCnt: todaySendCnt = 0 } = frdPointRec || {};
return resResult(STATUS.SUCCESS, { return resResult(STATUS.SUCCESS, {
todayReceiveCnt, todayReceiveCnt,
@@ -335,21 +336,21 @@ export class FriendHandler {
} }
// 获取黑名单 // 获取黑名单
public async getBlackList(msg: { }, session: BackendSession) { public async getBlackList(msg: {}, session: BackendSession) {
let roleId: string = session.get('roleId'); let roleId: string = session.get('roleId');
let role = await RoleModel.findByRoleId(roleId); let role = await RoleModel.findByRoleId(roleId);
let list = new Array<BlackListParam>(); let list = new Array<BlackListParam>();
let myRelation = await FriendRelationModel.findFriendByRole(roleId, POPULATE_TYPE.BLACKLIST); let myRelation = await FriendRelationModel.findFriendByRole(roleId, POPULATE_TYPE.BLACKLIST);
let blacklist = myRelation?myRelation.blacklist: []; let blacklist = myRelation ? myRelation.blacklist : [];
for(let bl of blacklist) { for (let bl of blacklist) {
let friendRole = <RoleType>bl.role; let friendRole = <RoleType>bl.role;
if(!friendRole) continue; if (!friendRole) continue;
let param = new BlackListParam(friendRole); let param = new BlackListParam(friendRole);
let isOnline = await isRoleOnline(friendRole.roleId); let isOnline = await isRoleOnline(friendRole.roleId);
param.setOnline(isOnline); param.setOnline(isOnline);
let { serverId, userInfo: { serverType }} = friendRole; let { serverId, userInfo: { serverType } } = friendRole;
let serverName = await getServerName(serverType, serverId); let serverName = await getServerName(serverType, serverId);
param.setServerName(serverId, serverName); param.setServerName(serverId, serverName);
@@ -373,30 +374,31 @@ export class FriendHandler {
let roleId: string = session.get('roleId'); let roleId: string = session.get('roleId');
let sid: string = session.get('sid'); let sid: string = session.get('sid');
let funcs: number[] = session.get('funcs'); let funcs: number[] = session.get('funcs');
const serverId = session.get('serverId');
let { roleId: hisRoleId, type } = msg; let { roleId: hisRoleId, type } = msg;
let role = await RoleModel.findByRoleId(roleId); let role = await RoleModel.findByRoleId(roleId);
let friend: RoleType; let friend: RoleType;
let str = '', list = new Array<BlackListParam>(), frdRoleIds = new Array<string>(), blackRoleIds = new Array<string>(); let str = '', list = new Array<BlackListParam>(), frdRoleIds = new Array<string>(), blackRoleIds = new Array<string>();
if(type == BLOCK_OPEATE.ADD) { // 拉黑 if (type == BLOCK_OPEATE.ADD) { // 拉黑
let myRelation = await FriendRelationModel.findFriendByRole(roleId, POPULATE_TYPE.FRIEND); let myRelation = await FriendRelationModel.findFriendByRole(roleId, POPULATE_TYPE.FRIEND);
let friends = myRelation?myRelation.friends: []; let friends = myRelation ? myRelation.friends : [];
let blacklist = myRelation?myRelation.blacklist: []; let blacklist = myRelation ? myRelation.blacklist : [];
let curFriend = friends.find(cur => cur.roleId == hisRoleId); let curFriend = friends.find(cur => cur.roleId == hisRoleId);
let curBlack = blacklist.find(cur => cur.roleId == hisRoleId); let curBlack = blacklist.find(cur => cur.roleId == hisRoleId);
if(curBlack) { if (curBlack) {
return resResult(STATUS.FRIEND_BLACK_HAS_ADD); return resResult(STATUS.FRIEND_BLACK_HAS_ADD);
} }
role = await RoleModel.increaseBlockCnt(roleId, 1, curFriend? -1: 0, FRIEND.FRIEND_BLACKLIST_MAX); // 增加黑名单人数 role = await RoleModel.increaseBlockCnt(roleId, 1, curFriend ? -1 : 0, FRIEND.FRIEND_BLACKLIST_MAX); // 增加黑名单人数
if(!role) { if (!role) {
return resResult(STATUS.FRIEND_BLACK_MAX) return resResult(STATUS.FRIEND_BLACK_MAX)
} }
friend = await RoleModel.increaseFriendCnt(hisRoleId, curFriend? -1: 0); // 对方好友减少 friend = await RoleModel.increaseFriendCnt(hisRoleId, curFriend ? -1 : 0); // 对方好友减少
let friendShip: FriendShipType; let friendShip: FriendShipType;
if(!!curFriend) { if (!!curFriend) {
await FriendShipModel.clearValue([roleId, hisRoleId]); await FriendShipModel.clearValue([roleId, hisRoleId]);
friendShip = <FriendShipType>curFriend.friendShip; friendShip = <FriendShipType>curFriend.friendShip;
} }
@@ -410,7 +412,7 @@ export class FriendHandler {
let isOnline = await isRoleOnline(friend.roleId); let isOnline = await isRoleOnline(friend.roleId);
param.setOnline(isOnline); param.setOnline(isOnline);
let { serverId, userInfo: { serverType }} = friend; let { serverId, userInfo: { serverType } } = friend;
let serverName = await getServerName(serverType, serverId); let serverName = await getServerName(serverType, serverId);
param.setServerName(serverId, serverName); param.setServerName(serverId, serverName);
@@ -420,14 +422,14 @@ export class FriendHandler {
} else if (type == BLOCK_OPEATE.REMOVE_FRIEND) { // 仅移除 } else if (type == BLOCK_OPEATE.REMOVE_FRIEND) { // 仅移除
let myRelation = await FriendRelationModel.findFriendByRole(roleId, POPULATE_TYPE.FRIEND); let myRelation = await FriendRelationModel.findFriendByRole(roleId, POPULATE_TYPE.FRIEND);
let friends = myRelation?myRelation.friends: []; let friends = myRelation ? myRelation.friends : [];
let curFriend = friends.find(cur => cur.roleId == hisRoleId); let curFriend = friends.find(cur => cur.roleId == hisRoleId);
if(!curFriend) { if (!curFriend) {
return resResult(STATUS.FRIEND_NOT_FOUND); return resResult(STATUS.FRIEND_NOT_FOUND);
} }
role = await RoleModel.increaseFriendCnt(roleId, -1); // 减少好友 role = await RoleModel.increaseFriendCnt(roleId, -1); // 减少好友
if(!role) { if (!role) {
return resResult(STATUS.FRIEND_NOT_FOUND) return resResult(STATUS.FRIEND_NOT_FOUND)
} }
friend = await RoleModel.increaseFriendCnt(hisRoleId, -1); // 对方好友减少 friend = await RoleModel.increaseFriendCnt(hisRoleId, -1); // 对方好友减少
@@ -442,25 +444,25 @@ export class FriendHandler {
frdRoleIds.push(roleId); frdRoleIds.push(roleId);
} else if(type == BLOCK_OPEATE.REMOVE_BLACK || type == BLOCK_OPEATE.REMOVE_AND_APPLY){ } else if (type == BLOCK_OPEATE.REMOVE_BLACK || type == BLOCK_OPEATE.REMOVE_AND_APPLY) {
let myRelation = await FriendRelationModel.findFriendByRole(roleId, POPULATE_TYPE.BLACKLIST); let myRelation = await FriendRelationModel.findFriendByRole(roleId, POPULATE_TYPE.BLACKLIST);
let blacklist = myRelation?myRelation.blacklist: []; let blacklist = myRelation ? myRelation.blacklist : [];
let curFriend = blacklist.find(cur => cur.roleId == hisRoleId); let curFriend = blacklist.find(cur => cur.roleId == hisRoleId);
if(!curFriend) { if (!curFriend) {
return resResult(STATUS.FRIEND_BLACK_NOT_FOUND); return resResult(STATUS.FRIEND_BLACK_NOT_FOUND);
} }
role = await RoleModel.increaseBlockCnt(roleId, -1, 0, 100); // 黑名单人数减 role = await RoleModel.increaseBlockCnt(roleId, -1, 0, 100); // 黑名单人数减
if(!role) { if (!role) {
return resResult(STATUS.FRIEND_BLACK_MAX) return resResult(STATUS.FRIEND_BLACK_MAX)
} }
await FriendRelationModel.removeFromBlack(roleId, hisRoleId); await FriendRelationModel.removeFromBlack(roleId, hisRoleId);
if(type == BLOCK_OPEATE.REMOVE_AND_APPLY) { if (type == BLOCK_OPEATE.REMOVE_AND_APPLY) {
// 申请好友 // 申请好友
friend = await RoleModel.increaseFriendApplyCnt(hisRoleId, 1, FRIEND.FRIEND_MANAGE_APPLICATION); friend = await RoleModel.increaseFriendApplyCnt(hisRoleId, 1, FRIEND.FRIEND_MANAGE_APPLICATION);
if(!friend) { if (!friend) {
str = getResStr(STATUS.FRIEND_HIS_APPLY_MAX); str = getResStr(STATUS.FRIEND_HIS_APPLY_MAX);
} else { } else {
await FriendApplyModel.createApply(hisRoleId, role); await FriendApplyModel.createApply(hisRoleId, role);
@@ -475,7 +477,7 @@ export class FriendHandler {
let { friendCnt = 0, blockCnt = 0 } = role; let { friendCnt = 0, blockCnt = 0 } = role;
// 任务 // 任务
await checkTaskWithRoles(roleId, sid, funcs, TASK_TYPE.FRIEND_NUM, [role, friend]); await checkTaskWithRoles(serverId, roleId, sid, funcs, TASK_TYPE.FRIEND_NUM, [role, friend]);
return resResult(STATUS.SUCCESS, { return resResult(STATUS.SUCCESS, {
frdRoleIds, blackRoleIds, frdRoleIds, blackRoleIds,
@@ -496,11 +498,11 @@ export class FriendHandler {
let { roleId: hisRoleId } = msg; let { roleId: hisRoleId } = msg;
let myRelation = await FriendRelationModel.findFriendByRole(roleId, POPULATE_TYPE.FRIEND); // 好友关系，只有friendship被populate了 let myRelation = await FriendRelationModel.findFriendByRole(roleId, POPULATE_TYPE.FRIEND); // 好友关系，只有friendship被populate了
let friends = myRelation?myRelation.friends: []; let friends = myRelation ? myRelation.friends : [];
let arr = new Array<Relation>(); let arr = new Array<Relation>();
if(hisRoleId != '') { if (hisRoleId != '') {
let cur = friends.find(cur => cur.roleId == hisRoleId); let cur = friends.find(cur => cur.roleId == hisRoleId);
if(!cur) return resResult(STATUS.FRIEND_NOT_FOUND); if (!cur) return resResult(STATUS.FRIEND_NOT_FOUND);
arr.push(cur); arr.push(cur);
} else { } else {
@@ -508,26 +510,26 @@ export class FriendHandler {
} }
let canSendList = await sortByBeSentHeart(roleId, arr); let canSendList = await sortByBeSentHeart(roleId, arr);
let {lv} = await RoleModel.findByRoleId(roleId, ROLE_SELECT.GET_LV); let { lv } = await RoleModel.findByRoleId(roleId, ROLE_SELECT.GET_LV);
let dicFriendLv = getDicFriendByLv(lv); let dicFriendLv = getDicFriendByLv(lv);
if(!dicFriendLv) return resResult(STATUS.DIC_DATA_NOT_FOUND); if (!dicFriendLv) return resResult(STATUS.DIC_DATA_NOT_FOUND);
// 情谊值有上限，送到上限为止 // 情谊值有上限，送到上限为止
let max = dicFriendLv.sendMax; let max = dicFriendLv.sendMax;
let frdPointRec = await FriendPointModel.getFrdPointRecToday(roleId, FRIEND_DROP_TYPE.SEND_GIFT); let frdPointRec = await FriendPointModel.getFrdPointRecToday(roleId, FRIEND_DROP_TYPE.SEND_GIFT);
let { sendCnt: todaySendCnt = 0 } = frdPointRec||{}; let { sendCnt: todaySendCnt = 0 } = frdPointRec || {};
let todaySendInc = 0; let todaySendInc = 0;
let list = new Array<FriendValueListParam>(); let list = new Array<FriendValueListParam>();
let uids = []; let uids = [];
for(let relation of canSendList) { for (let relation of canSendList) {
if(todaySendCnt + FRIEND.FRIEND_FRIENDPOINT_ADD > max) break; if (todaySendCnt + FRIEND.FRIEND_FRIENDPOINT_ADD > max) break;
let fs = <FriendShipType>relation.friendShip; let fs = <FriendShipType>relation.friendShip;
let ref = shouldRefresh(fs.refTime, new Date()); let ref = shouldRefresh(fs.refTime, new Date());
let sendHeartRec = await FriendShipModel.sendHeart(roleId, relation.roleId, 1, FRIEND.FRIEND_RECEIVE_SINGLE, ref); let sendHeartRec = await FriendShipModel.sendHeart(roleId, relation.roleId, 1, FRIEND.FRIEND_RECEIVE_SINGLE, ref);
if(!sendHeartRec) continue; if (!sendHeartRec) continue;
let param = new FriendValueListParam(relation.roleId, roleId, sendHeartRec); let param = new FriendValueListParam(relation.roleId, roleId, sendHeartRec);
list.push(param); list.push(param);
@@ -536,12 +538,12 @@ export class FriendHandler {
todaySendInc += FRIEND.FRIEND_FRIENDPOINT_ADD; todaySendInc += FRIEND.FRIEND_FRIENDPOINT_ADD;
let hisOnlineInfo = await getRoleOnlineInfo(relation.roleId); let hisOnlineInfo = await getRoleOnlineInfo(relation.roleId);
if(hisOnlineInfo.isOnline) { if (hisOnlineInfo.isOnline) {
uids.push({ uid: relation.roleId, sid: hisOnlineInfo.sid }); uids.push({ uid: relation.roleId, sid: hisOnlineInfo.sid });
} }
} }
this.channelService.pushMessageByUids('onFriendSendHeart', resResult(STATUS.SUCCESS, {roleId}), uids); this.channelService.pushMessageByUids('onFriendSendHeart', resResult(STATUS.SUCCESS, { roleId }), uids);
if(todaySendInc <= 0) return resResult(STATUS.FRIEND_HAS_SENT); if (todaySendInc <= 0) return resResult(STATUS.FRIEND_HAS_SENT);
// 更新情谊值 // 更新情谊值
frdPointRec = await FriendPointModel.updateSendCntToday(roleId, roleName, todaySendInc, max, FRIEND_DROP_TYPE.SEND_GIFT); frdPointRec = await FriendPointModel.updateSendCntToday(roleId, roleName, todaySendInc, max, FRIEND_DROP_TYPE.SEND_GIFT);
@@ -563,11 +565,11 @@ export class FriendHandler {
let { roleId: hisRoleId } = msg; let { roleId: hisRoleId } = msg;
let myRelation = await FriendRelationModel.findFriendByRole(roleId, POPULATE_TYPE.FRIEND); // 好友关系，只有friendship被populate了 let myRelation = await FriendRelationModel.findFriendByRole(roleId, POPULATE_TYPE.FRIEND); // 好友关系，只有friendship被populate了
let friends = myRelation?myRelation.friends: []; let friends = myRelation ? myRelation.friends : [];
let arr = new Array<Relation>(); let arr = new Array<Relation>();
if(hisRoleId != '') { if (hisRoleId != '') {
let cur = friends.find(cur => cur.roleId == hisRoleId); let cur = friends.find(cur => cur.roleId == hisRoleId);
if(!cur) return resResult(STATUS.FRIEND_NOT_FOUND); if (!cur) return resResult(STATUS.FRIEND_NOT_FOUND);
arr.push(cur); arr.push(cur);
} else { } else {
@@ -575,26 +577,26 @@ export class FriendHandler {
} }
let canReceiveList = await sortByBeSentHeart(roleId, arr); let canReceiveList = await sortByBeSentHeart(roleId, arr);
let {lv} = await RoleModel.findByRoleId(roleId, ROLE_SELECT.GET_LV); let { lv } = await RoleModel.findByRoleId(roleId, ROLE_SELECT.GET_LV);
let dicFriendLv = getDicFriendByLv(lv); let dicFriendLv = getDicFriendByLv(lv);
if(!dicFriendLv) return resResult(STATUS.DIC_DATA_NOT_FOUND); if (!dicFriendLv) return resResult(STATUS.DIC_DATA_NOT_FOUND);
// 情谊值有上限，到上限为止 // 情谊值有上限，到上限为止
let max = dicFriendLv.receiveMax; let max = dicFriendLv.receiveMax;
let frdPointRec = await FriendPointModel.getFrdPointRecToday(roleId, FRIEND_DROP_TYPE.SEND_GIFT); let frdPointRec = await FriendPointModel.getFrdPointRecToday(roleId, FRIEND_DROP_TYPE.SEND_GIFT);
let { cnt: todayReceiveCnt = 0 } = frdPointRec||{}; let { cnt: todayReceiveCnt = 0 } = frdPointRec || {};
let todayReceiveInc = 0; let todayReceiveInc = 0;
let list = new Array<FriendValueListParam>(); let list = new Array<FriendValueListParam>();
for(let relation of canReceiveList) { for (let relation of canReceiveList) {
if(relation.beSentHeart > 0) { if (relation.beSentHeart > 0) {
if(todayReceiveCnt + FRIEND.FRIEND_FRIENDPOINT_ADD > max) break; if (todayReceiveCnt + FRIEND.FRIEND_FRIENDPOINT_ADD > max) break;
// 收取爱心 // 收取爱心
let fs = <FriendShipType>relation.friendShip; let fs = <FriendShipType>relation.friendShip;
let ref = shouldRefresh(fs.refTime, new Date()); let ref = shouldRefresh(fs.refTime, new Date());
let receiveHeartRec = await FriendShipModel.receiveHeart(roleId, relation.roleId, 1, relation.beSentHeart, ref); let receiveHeartRec = await FriendShipModel.receiveHeart(roleId, relation.roleId, 1, relation.beSentHeart, ref);
if(!receiveHeartRec) continue; if (!receiveHeartRec) continue;
let param = new FriendValueListParam(relation.roleId, roleId, receiveHeartRec); let param = new FriendValueListParam(relation.roleId, roleId, receiveHeartRec);
list.push(param); list.push(param);
@@ -603,7 +605,7 @@ export class FriendHandler {
todayReceiveInc += FRIEND.FRIEND_FRIENDPOINT_ADD; todayReceiveInc += FRIEND.FRIEND_FRIENDPOINT_ADD;
} }
} }
if(todayReceiveInc <= 0) return resResult(STATUS.FRIEND_HAS_RECEIVE); if (todayReceiveInc <= 0) return resResult(STATUS.FRIEND_HAS_RECEIVE);
let fp = getFriendPointObject(todayReceiveCnt); let fp = getFriendPointObject(todayReceiveCnt);
let goods = await addItems(roleId, roleName, sid, [fp]) let goods = await addItems(roleId, roleName, sid, [fp])
@@ -624,14 +626,14 @@ export class FriendHandler {
let { roleId: hisRoleId, items } = msg; let { roleId: hisRoleId, items } = msg;
let myRelation = await FriendRelationModel.findFriendByRole(roleId, POPULATE_TYPE.FRIEND_NAME_ONLY); let myRelation = await FriendRelationModel.findFriendByRole(roleId, POPULATE_TYPE.FRIEND_NAME_ONLY);
let friends = myRelation?myRelation.friends: []; let friends = myRelation ? myRelation.friends : [];
let curFriend = friends.find(cur => cur.roleId == hisRoleId); let curFriend = friends.find(cur => cur.roleId == hisRoleId);
if(!curFriend) return resResult(STATUS.FRIEND_NOT_FOUND); if (!curFriend) return resResult(STATUS.FRIEND_NOT_FOUND);
let friendValueInc = 0; let friendValueInc = 0;
for(let {id, count} of items ) { for (let { id, count } of items) {
let dicGood = gameData.goods.get(id); let dicGood = gameData.goods.get(id);
if(!dicGood) { if (!dicGood) {
return resResult(STATUS.DIC_DATA_NOT_FOUND); return resResult(STATUS.DIC_DATA_NOT_FOUND);
} }
@@ -644,14 +646,14 @@ export class FriendHandler {
} }
let costResult = await handleCost(roleId, sid, items); let costResult = await handleCost(roleId, sid, items);
if(!costResult) return resResult(STATUS.ROLE_MATERIAL_NOT_ENOUGH); if (!costResult) return resResult(STATUS.ROLE_MATERIAL_NOT_ENOUGH);
let result = await FriendShipModel.addFriendValue(roleId, hisRoleId, friendValueInc); let result = await FriendShipModel.addFriendValue(roleId, hisRoleId, friendValueInc);
if(!result) return resResult(STATUS.FRIEND_NOT_FOUND); if (!result) return resResult(STATUS.FRIEND_NOT_FOUND);
// TODO 日志可以转到log服 // TODO 日志可以转到log服
await FriendPresentLogModel.createRecord(roleId, hisRoleId, items); await FriendPresentLogModel.createRecord(roleId, hisRoleId, items);
for(let {id, count} of items ) { for (let { id, count } of items) {
const msgData = await createPrivateMsg(roleId, roleName, MSG_TYPE.RICH_TEXT, MSG_SOURCE.PRIVATE_SEND_GIFT, JSON.stringify({ id, count }), hisRoleId, null); const msgData = await createPrivateMsg(roleId, roleName, MSG_TYPE.RICH_TEXT, MSG_SOURCE.PRIVATE_SEND_GIFT, JSON.stringify({ id, count }), hisRoleId, null);
await pushMsgToRole(msgData); await pushMsgToRole(msgData);
let hisRole = <RoleType>curFriend.role; let hisRole = <RoleType>curFriend.role;
@@ -677,10 +679,10 @@ export class FriendHandler {
let heroes = new Array<PlayerDetailHero>(); let heroes = new Array<PlayerDetailHero>();
if(showLineup) { // 设置过展示阵容 if (showLineup) { // 设置过展示阵容
for(let hid of showLineup) { for (let hid of showLineup) {
let curHero = dbHeroes.find(cur => cur.hid == hid); let curHero = dbHeroes.find(cur => cur.hid == hid);
if(curHero) { if (curHero) {
let { lv, star, colorStar, quality } = curHero; let { lv, star, colorStar, quality } = curHero;
heroes.push({ heroes.push({
actorId: hid, lv, star, colorStar, quality, actorId: hid, lv, star, colorStar, quality,
@@ -689,9 +691,9 @@ export class FriendHandler {
} }
} }
} else { } else {
for(let { hid } of topLineup) { for (let { hid } of topLineup) {
let curHero = dbHeroes.find(cur => cur.hid == hid); let curHero = dbHeroes.find(cur => cur.hid == hid);
if(curHero) { if (curHero) {
let { lv, star, colorStar, quality } = curHero; let { lv, star, colorStar, quality } = curHero;
heroes.push({ heroes.push({
actorId: hid, lv, star, colorStar, quality, actorId: hid, lv, star, colorStar, quality,
@@ -704,7 +706,7 @@ export class FriendHandler {
let r = new Rank(REDIS_KEY.PVP_RANK, {}); let r = new Rank(REDIS_KEY.PVP_RANK, {});
let rank = await r.getMyRank({ roleId: oppoRoleId });//去redis中获取排名 let rank = await r.getMyRank({ roleId: oppoRoleId });//去redis中获取排名
result = new PlayerDetail({...role, defCe: topLineupCe, heroes}); result = new PlayerDetail({ ...role, defCe: topLineupCe, heroes });
result.setWarStar(role.warStar, rank, towerLv); result.setWarStar(role.warStar, rank, towerLv);
return resResult(STATUS.SUCCESS, result); return resResult(STATUS.SUCCESS, result);
@@ -718,13 +720,13 @@ export class FriendHandler {
let { roleId: hisRoleId, hids } = msg; let { roleId: hisRoleId, hids } = msg;
let role = await RoleModel.findByRoleId(hisRoleId, ROLE_SELECT.ATTR); let role = await RoleModel.findByRoleId(hisRoleId, ROLE_SELECT.ATTR);
if(!role) return resResult(STATUS.ROLE_NOT_FOUND); if (!role) return resResult(STATUS.ROLE_NOT_FOUND);
let heroList = await HeroModel.findByHidRange(hids, hisRoleId, HERO_SELECT.HERO_DETAIL, true); let heroList = await HeroModel.findByHidRange(hids, hisRoleId, HERO_SELECT.HERO_DETAIL, true);
if(heroList.length <= 0) return resResult(STATUS.HERO_NOT_FIND); if (heroList.length <= 0) return resResult(STATUS.HERO_NOT_FIND);
let list = new Array(); let list = new Array();
for(let {roleId, roleName, hid, hName, ce, lv, star, colorStar, quality, job, skins, attr: heroAttrs} of heroList) { for (let { roleId, roleName, hid, hName, ce, lv, star, colorStar, quality, job, skins, attr: heroAttrs } of heroList) {
let curSkin = skins.find(cur => cur.enable); let curSkin = skins.find(cur => cur.enable);
let equips = await EquipModel.findListByHidAndRole(hisRoleId, hid, EQUIP_SELECT.HERO_DETAIL); let equips = await EquipModel.findListByHidAndRole(hisRoleId, hid, EQUIP_SELECT.HERO_DETAIL);
@@ -733,7 +735,7 @@ export class FriendHandler {
list.push({ list.push({
roleId, roleName, hid, hName, ce, lv, star, colorStar, quality, job, roleId, roleName, hid, hName, ce, lv, star, colorStar, quality, job,
skin: curSkin?curSkin.id: 0, equips, attributes skin: curSkin ? curSkin.id : 0, equips, attributes
}); });
} }
game-server/app/servers/role/handler/heroHandler.ts
+10 -8
View File
@@ -27,7 +27,7 @@ export class HeroHandler {
public async test(msg: {}, session: BackendSession) { public async test(msg: {}, session: BackendSession) {
let heroes = [...gameData.hero]; let heroes = [...gameData.hero];
return resResult(STATUS.SUCCESS, {heroes}) return resResult(STATUS.SUCCESS, { heroes })
} }
// ! 测试接口，用来测试前清理并初始化某个武将；代码抄自：gm-server/app/service/users.ts deleteHero // ! 测试接口，用来测试前清理并初始化某个武将；代码抄自：gm-server/app/service/users.ts deleteHero
@@ -186,6 +186,7 @@ export class HeroHandler {
// 武将升星 // 武将升星
public async starUp(msg: { hid: number, star: number, starStage: number }, session: BackendSession) { public async starUp(msg: { hid: number, star: number, starStage: number }, session: BackendSession) {
let roleId: string = session.get('roleId'); let roleId: string = session.get('roleId');
const serverId = session.get('serverId');
let sid: string = session.get('sid'); let sid: string = session.get('sid');
let funcs: number[] = session.get('funcs'); let funcs: number[] = session.get('funcs');
@@ -226,9 +227,9 @@ export class HeroHandler {
await checkTaskWithHero(roleId, sid, funcs, TASK_TYPE.HERO_STAR_UP, hero); await checkTaskWithHero(roleId, sid, funcs, TASK_TYPE.HERO_STAR_UP, hero);
await checkTaskWithHero(roleId, sid, funcs, TASK_TYPE.HERO_QUALITY_STAR_UP, hero); await checkTaskWithHero(roleId, sid, funcs, TASK_TYPE.HERO_QUALITY_STAR_UP, hero);
//成长任务 //成长任务
await accomplishTask(roleId, TASK_TYPE.HERO_QUALITY_STAR_UP, 1, { quality: dicHero.quality, star: hero.star }); await accomplishTask(serverId, roleId, TASK_TYPE.HERO_QUALITY_STAR_UP, 1, { quality: dicHero.quality, star: hero.star });
if (hero.colorStar) {//觉醒升星 if (hero.colorStar) {//觉醒升星
await accomplishTask(roleId, TASK_TYPE.HERO_WAKE_UP_STAR_UP_COUNT, 1, { quality: dicHero.quality, star: hero.star }); await accomplishTask(serverId, roleId, TASK_TYPE.HERO_WAKE_UP_STAR_UP_COUNT, 1, { quality: dicHero.quality, star: hero.star });
} }
} }
@@ -247,7 +248,7 @@ export class HeroHandler {
let roleId: string = session.get('roleId'); let roleId: string = session.get('roleId');
let roleName: string = session.get('roleName'); let roleName: string = session.get('roleName');
let sid: string = session.get('sid'); let sid: string = session.get('sid');
let serverId: string = session.get('serverId'); let serverId: number = session.get('serverId');
let funcs: number[] = session.get('funcs'); let funcs: number[] = session.get('funcs');
let { hid, quality } = msg; let { hid, quality } = msg;
@@ -285,7 +286,7 @@ export class HeroHandler {
// 任务 // 任务
await checkTaskWithHero(roleId, sid, funcs, TASK_TYPE.HERO_QUALITY_UP, hero); await checkTaskWithHero(roleId, sid, funcs, TASK_TYPE.HERO_QUALITY_UP, hero);
// 任务 // 任务
await accomplishTask(roleId, TASK_TYPE.HERO_QUALITY_TO_QUALITY_COUNT, 1, { oldQuality, quality: hero.quality }); await accomplishTask(serverId, roleId, TASK_TYPE.HERO_QUALITY_TO_QUALITY_COUNT, 1, { oldQuality, quality: hero.quality });
const curHero = { const curHero = {
hid, hid,
@@ -301,7 +302,7 @@ export class HeroHandler {
let roleId: string = session.get('roleId'); let roleId: string = session.get('roleId');
let sid: string = session.get('sid'); let sid: string = session.get('sid');
let roleName: string = session.get('roleName'); let roleName: string = session.get('roleName');
let serverId: string = session.get('serverId'); const serverId = session.get('serverId');
let funcs: number[] = session.get('funcs'); let funcs: number[] = session.get('funcs');
let { hid, colorStar, colorStarStage } = msg; let { hid, colorStar, colorStarStage } = msg;
@@ -348,7 +349,7 @@ export class HeroHandler {
// 任务 // 任务
await checkTaskWithHero(roleId, sid, funcs, TASK_TYPE.HERO_STAR_UP, hero); await checkTaskWithHero(roleId, sid, funcs, TASK_TYPE.HERO_STAR_UP, hero);
await checkTask(roleId, sid, funcs, TASK_TYPE.HERO_WAKE_UP, 1, true, {}); await checkTask(roleId, sid, funcs, TASK_TYPE.HERO_WAKE_UP, 1, true, {});
await accomplishTask(roleId, TASK_TYPE.HERO_WAKE_UP_COUNT, 1, { quality: hero.quality }); await accomplishTask(serverId, roleId, TASK_TYPE.HERO_WAKE_UP_COUNT, 1, { quality: hero.quality });
} }
const curHero = { const curHero = {
hid, hid,
@@ -403,6 +404,7 @@ export class HeroHandler {
async heroJobStageUp(msg: { hid: number }, session: BackendSession) { async heroJobStageUp(msg: { hid: number }, session: BackendSession) {
console.log(JSON.stringify([...gameData.jobClassMaxGrades])) console.log(JSON.stringify([...gameData.jobClassMaxGrades]))
let roleId: string = session.get('roleId'); let roleId: string = session.get('roleId');
const serverId = session.get('serverId');
let sid: string = session.get('sid'); let sid: string = session.get('sid');
let funcs: number[] = session.get('funcs'); let funcs: number[] = session.get('funcs');
let { hid } = msg; let { hid } = msg;
@@ -430,7 +432,7 @@ export class HeroHandler {
hero = await calPlayerCeAndSave(HERO_SYSTEM_TYPE.STAGEUP, sid, roleId, hero, update); hero = await calPlayerCeAndSave(HERO_SYSTEM_TYPE.STAGEUP, sid, roleId, hero, update);
// 任务 // 任务
await checkTaskWithHero(roleId, sid, funcs, TASK_TYPE.HERO_STAGE_UP, hero); await checkTaskWithHero(roleId, sid, funcs, TASK_TYPE.HERO_STAGE_UP, hero);
await accomplishTask(roleId, TASK_TYPE.HERO_STAGE_UP, 1, { job: hero.job }); await accomplishTask(serverId, roleId, TASK_TYPE.HERO_STAGE_UP, 1, { job: hero.job });
return resResult(STATUS.SUCCESS, { curHero: { hid: hero.hid, job: hero.job, jobStage: hero.jobStage } }); return resResult(STATUS.SUCCESS, { curHero: { hid: hero.hid, job: hero.job, jobStage: hero.jobStage } });
} }
game-server/app/servers/role/handler/roleHandler.ts
+5 -3
View File
@@ -39,7 +39,7 @@ export class RoleHandler {
let { roleName } = msg; let { roleName } = msg;
let role = await RoleModel.findByRoleId(roleId, 'roleName hasInit', true); let role = await RoleModel.findByRoleId(roleId, 'roleName hasInit', true);
if(role.hasInit) return resResult(STATUS.ROLE_HAS_INIT); if (role.hasInit) return resResult(STATUS.ROLE_HAS_INIT);
let checkName = await RoleModel.checkName(roleName, serverId); let checkName = await RoleModel.checkName(roleName, serverId);
if (checkName) return resResult(STATUS.NAME_HAS_USED); if (checkName) return resResult(STATUS.NAME_HAS_USED);
@@ -79,6 +79,7 @@ export class RoleHandler {
async roleTitleLevelUp(msg: {}, session: BackendSession) { async roleTitleLevelUp(msg: {}, session: BackendSession) {
let roleId = session.get('roleId'); let roleId = session.get('roleId');
let sid: string = session.get('sid'); let sid: string = session.get('sid');
const serverId = session.get('serverId');
let funcs: number[] = session.get('funcs'); let funcs: number[] = session.get('funcs');
let role = await RoleModel.findByRoleId(roleId); let role = await RoleModel.findByRoleId(roleId);
@@ -100,7 +101,7 @@ export class RoleHandler {
// 任务 // 任务
await checkTask(roleId, sid, funcs, TASK_TYPE.ROLE_TITLE, 1, false, { title }); await checkTask(roleId, sid, funcs, TASK_TYPE.ROLE_TITLE, 1, false, { title });
//成长任务 //成长任务
await accomplishTask(roleId, TASK_TYPE.ROLE_TITLE, update.title) await accomplishTask(serverId, roleId, TASK_TYPE.ROLE_TITLE, update.title)
return resResult(STATUS.SUCCESS, { roleId, title: role.title }); return resResult(STATUS.SUCCESS, { roleId, title: role.title });
} }
@@ -231,6 +232,7 @@ export class RoleHandler {
let roleId = session.get('roleId'); let roleId = session.get('roleId');
let sid = session.get('sid'); let sid = session.get('sid');
let funcs: number[] = session.get('funcs'); let funcs: number[] = session.get('funcs');
const serverId = session.get('serverId');
let { schoolId, positionId, hid } = msg; let { schoolId, positionId, hid } = msg;
if (!gameData.school.has(schoolId)) { if (!gameData.school.has(schoolId)) {
@@ -271,7 +273,7 @@ export class RoleHandler {
await checkTaskWithArgs(roleId, sid, funcs, TASK_TYPE.ROLE_SCHOOL_UNLOCK, [hid, preHid]); await checkTaskWithArgs(roleId, sid, funcs, TASK_TYPE.ROLE_SCHOOL_UNLOCK, [hid, preHid]);
if (hid > 0) { if (hid > 0) {
//成长任务 //成长任务
await accomplishTask(roleId, TASK_TYPE.ROLE_SCHOOL_PUT_HERO, 1) await accomplishTask(serverId, roleId, TASK_TYPE.ROLE_SCHOOL_PUT_HERO, 1)
} }
return resResult(STATUS.SUCCESS, { return resResult(STATUS.SUCCESS, {
game-server/app/services/dailyChallengesService.ts
+1 -1
View File
@@ -12,7 +12,7 @@ import { DailyChallengesData, DailyItem } from '../domain/activityField/dailyCha
* *
*/ */
export async function getPlayerDailyChallengesData(activityId: number, serverId: number, roleId: string) { export async function getPlayerDailyChallengesData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true); let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerRecords: ActivityDailyChallengesModelType[] = await ActivityDailyChallengesModel.findData(serverId, activityId, roleId); let playerRecords: ActivityDailyChallengesModelType[] = await ActivityDailyChallengesModel.findData(serverId, activityId, roleId);
let playerData = new DailyChallengesData(activityData); let playerData = new DailyChallengesData(activityData);
game-server/app/services/dailyGiftsService.ts
+1 -1
View File
@@ -12,7 +12,7 @@ import { DailyGiftsData, DailyGiftItem } from '../domain/activityField/dailyGift
* *
*/ */
export async function getPlayerDailyGiftsData(activityId: number, serverId: number, roleId: string) { export async function getPlayerDailyGiftsData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true); let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerRecords: ActivityDailyGiftsModelType[] = await ActivityDailyGiftsModel.findData(serverId, activityId, roleId); let playerRecords: ActivityDailyGiftsModelType[] = await ActivityDailyGiftsModel.findData(serverId, activityId, roleId);
let playerData = new DailyGiftsData(activityData); let playerData = new DailyGiftsData(activityData);
game-server/app/services/dailyRMBGiftsService.ts
+3 -3
View File
@@ -18,7 +18,7 @@ import { addReward, stringToRewardParam } from './giftPackageService';
*/ */
export async function thirtyDaysActivity(type: number, serverId: number, roleId: string) { export async function thirtyDaysActivity(type: number, serverId: number, roleId: string) {
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(type, true) let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, type, true)
activityArray = activityArray.sort((a, b) => { activityArray = activityArray.sort((a, b) => {
return a.activityId - b.activityId return a.activityId - b.activityId
}); });
@@ -41,7 +41,7 @@ export async function thirtyDaysActivity(type: number, serverId: number, roleId:
* *
*/ */
export async function getPlayerDailyGiftsData(activityId: number, serverId: number, roleId: string) { export async function getPlayerDailyGiftsData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true); let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerData = new DailyRMBGiftsData(activityData); let playerData = new DailyRMBGiftsData(activityData);
let productID = playerData.productID; let productID = playerData.productID;
@@ -70,7 +70,7 @@ export async function getPlayerDailyGiftsData(activityId: number, serverId: numb
*/ */
export async function makeDailyRMBGiftsReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[], export async function makeDailyRMBGiftsReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
activityId: number, productID: string) { activityId: number, productID: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true); let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerData = new DailyRMBGiftsData(activityData); let playerData = new DailyRMBGiftsData(activityData);
let bigGiftProductID = playerData.productID; let bigGiftProductID = playerData.productID;
if (bigGiftProductID == productID) {//一次性购买7天礼包 if (bigGiftProductID == productID) {//一次性购买7天礼包
game-server/app/services/equipService.ts
+4 -4
View File
@@ -58,7 +58,7 @@ export function checkMaterialEnough(consumes: Array<{ id: number, count: number
* @param id 装备类型 * @param id 装备类型
* @param seqId 要装上的装备的唯一id 装备B * @param seqId 要装上的装备的唯一id 装备B
*/ */
export async function changeEquip(roleId: string, sid: string, equipA: EquipType, hid: number, id: number, equipB: EquipType, funcs: number[]) { export async function changeEquip(serverId: number, roleId: string, sid: string, equipA: EquipType, hid: number, id: number, equipB: EquipType, funcs: number[]) {
let heroB: HeroType; let heroB: HeroType;
if (!!hid) //需要卸下或者替换的武将 if (!!hid) //需要卸下或者替换的武将
heroB = await HeroModel.findByHidAndRoleWithEquip(hid, roleId);//需要替换的武将 heroB = await HeroModel.findByHidAndRoleWithEquip(hid, roleId);//需要替换的武将
@@ -77,7 +77,7 @@ export async function changeEquip(roleId: string, sid: string, equipA: EquipType
let res = await takeOffEquipAndCalPlayerCe(roleId, sid, heroB, equipB, id, funcs);//卸下装备并重算战力 let res = await takeOffEquipAndCalPlayerCe(roleId, sid, heroB, equipB, id, funcs);//卸下装备并重算战力
return res; return res;
} }
let res = await dressEquip(roleId, sid, heroB, equipA, funcs);//替换给武将，并计算战力 let res = await dressEquip(serverId, roleId, sid, heroB, equipA, funcs);//替换给武将，并计算战力
return res; return res;
} else { } else {
let res = await takeOffEquipAndCalPlayerCe(roleId, sid, null, equipA, id, funcs);//卸下装备并重算战力 let res = await takeOffEquipAndCalPlayerCe(roleId, sid, null, equipA, id, funcs);//卸下装备并重算战力
@@ -119,7 +119,7 @@ export async function takeOffEquipAndCalPlayerCe(roleId: string, sid: string, he
* @param hero * @param hero
* @param equip * @param equip
*/ */
export async function dressEquip(roleId: string, sid: string, hero: HeroType, equip: EquipType, funcs: number[]) { export async function dressEquip(serverId: number, roleId: string, sid: string, hero: HeroType, equip: EquipType, funcs: number[]) {
let args = calEquipSeids(hero); let args = calEquipSeids(hero);
hero = await HeroModel.addEquip(roleId, hero.hid, equip.ePlaceId, equip._id); hero = await HeroModel.addEquip(roleId, hero.hid, equip.ePlaceId, equip._id);
@@ -129,7 +129,7 @@ export async function dressEquip(roleId: string, sid: string, hero: HeroType, eq
await checkTask(roleId, sid, funcs, TASK_TYPE.EQUIP_SUM, 1, true, {}); await checkTask(roleId, sid, funcs, TASK_TYPE.EQUIP_SUM, 1, true, {});
await checkTaskWithHero(roleId, sid, funcs, TASK_TYPE.EQUIP_BY_HERO, hero, [1]); await checkTaskWithHero(roleId, sid, funcs, TASK_TYPE.EQUIP_BY_HERO, hero, [1]);
await checkTaskWithEquip(roleId, sid, funcs, TASK_TYPE.EQUIP_QUALITY, equip, [1]); await checkTaskWithEquip(roleId, sid, funcs, TASK_TYPE.EQUIP_QUALITY, equip, [1]);
await accomplishTask(roleId, TASK_TYPE.EQUIP_QUALITY, 1, { quality: equip.quality }) await accomplishTask(serverId, roleId, TASK_TYPE.EQUIP_QUALITY, 1, { quality: equip.quality })
return { seqId: equip.seqId, hid: hero.hid }; return { seqId: equip.seqId, hid: hero.hid };
} }
game-server/app/services/firstGiftService.ts
+2 -2
View File
@@ -13,7 +13,7 @@ import { FirstGiftData, FirstGiftItem } from '../domain/activityField/firstGiftF
*/ */
export async function firstGiftActivity(serverId: number, roleId: string) { export async function firstGiftActivity(serverId: number, roleId: string) {
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(ACTIVITY_TYPE.FIRST_GIFT, true) let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, ACTIVITY_TYPE.FIRST_GIFT, true)
activityArray = activityArray.sort((a, b) => { activityArray = activityArray.sort((a, b) => {
return a.activityId - b.activityId return a.activityId - b.activityId
}); });
@@ -34,7 +34,7 @@ export async function firstGiftActivity(serverId: number, roleId: string) {
* *
*/ */
export async function getPlayerFirstGiftData(activityId: number, serverId: number, roleId: string) { export async function getPlayerFirstGiftData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true); let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerRecord: ActivityFirstGiftModelType = await ActivityFirstGiftModel.findData(activityId, roleId); let playerRecord: ActivityFirstGiftModelType = await ActivityFirstGiftModel.findData(activityId, roleId);
let playerData = new FirstGiftData(activityData); let playerData = new FirstGiftData(activityData);
game-server/app/services/gachaService.ts
+48 -48
View File
@@ -13,10 +13,10 @@ import { gameData, getDicGachaFloor } from "../pubUtils/data";
* @param roleId 玩家id * @param roleId 玩家id
* @param aid 活动id * @param aid 活动id
*/ */
export async function getLimitGacha(roleId: string, activityId: number) { export async function getLimitGacha(serverId: number, roleId: string, activityId: number) {
let activityData = await ActivityModel.findActivity(activityId, true); let activityData = await ActivityModel.findActivity(serverId, activityId, true);
if(!activityData) return false; if (!activityData) return false;
let gachaData = new GachaData(activityData); let gachaData = new GachaData(activityData);
let userGacha = await UserGachaModel.findByRole(roleId, gachaData.gachaId, activityId); let userGacha = await UserGachaModel.findByRole(roleId, gachaData.gachaId, activityId);
@@ -33,17 +33,17 @@ export async function getLimitGacha(roleId: string, activityId: number) {
export async function refreshGacha(dicGacha: DicGacha, userGacha: UserGachaType) { export async function refreshGacha(dicGacha: DicGacha, userGacha: UserGachaType) {
let { day, count } = dicGacha.free; let { day, count } = dicGacha.free;
if(count <= 0) { if (count <= 0) {
return userGacha; return userGacha;
} }
let { roleId, gachaId, refFreeTime, refHopeTime, hope } = userGacha; let { roleId, gachaId, refFreeTime, refHopeTime, hope } = userGacha;
if(shouldRefresh(refFreeTime, new Date(), REFRESH_TIME, day)) { if (shouldRefresh(refFreeTime, new Date(), REFRESH_TIME, day)) {
let ref = <Date>getTimeFunD().getAfterDayByGap(refFreeTime, day); let ref = <Date>getTimeFunD().getAfterDayByGap(refFreeTime, day);
userGacha = await UserGachaModel.refreshFreeCount(roleId, gachaId, 0, ref); userGacha = await UserGachaModel.refreshFreeCount(roleId, gachaId, 0, ref);
} }
if(shouldRefresh(refHopeTime, new Date(), REFRESH_TIME)) { if (shouldRefresh(refHopeTime, new Date(), REFRESH_TIME)) {
hope = hope.map(cur => { return { ...cur, hasGet: false}}); hope = hope.map(cur => { return { ...cur, hasGet: false } });
let ref = getZeroPointD(); let ref = getZeroPointD();
userGacha = await UserGachaModel.refreshHopeCount(roleId, gachaId, 0, hope, ref); userGacha = await UserGachaModel.refreshHopeCount(roleId, gachaId, 0, hope, ref);
} }
@@ -58,24 +58,24 @@ export async function refreshGacha(dicGacha: DicGacha, userGacha: UserGachaType)
*/ */
export function getFloorResult(gachaId: number, base: number, floor: Floor[]) { export function getFloorResult(gachaId: number, base: number, floor: Floor[]) {
let dicGachaContent = gameData.gachaContent.get(base); // 普通随机得出的结果是哪一类； let dicGachaContent = gameData.gachaContent.get(base); // 普通随机得出的结果是哪一类；
if(!dicGachaContent) { if (!dicGachaContent) {
console.error('dic_zyz_gachaContent error'); console.error('dic_zyz_gachaContent error');
return false; // DIC_NOT_FOUND 直接报错 return false; // DIC_NOT_FOUND 直接报错
} }
let touchedFloor = 0, touchedHeroQuality: number; // 触发的保底的id let touchedFloor = 0, touchedHeroQuality: number; // 触发的保底的id
let dicFloorType = GACHA_TO_FLOOR.get(gachaId); let dicFloorType = GACHA_TO_FLOOR.get(gachaId);
for(let id of dicFloorType) { for (let id of dicFloorType) {
let { type, param } = dicGachaContent; let { type, param } = dicGachaContent;
let heroQuality = getHeroQuality(id); let heroQuality = getHeroQuality(id);
if(heroQuality == false) continue; if (heroQuality == false) continue;
let isTarget = type == GACHA_CONTENT_TYPE.HERO && param[0] == heroQuality; let isTarget = type == GACHA_CONTENT_TYPE.HERO && param[0] == heroQuality;
if(!isTarget) { // 触发保底 if (!isTarget) { // 触发保底
let percent = countFloorPercent(id, floor); let percent = countFloorPercent(id, floor);
let rand = Math.random(); let rand = Math.random();
if(rand < percent) { // 可以替换为保底 if (rand < percent) { // 可以替换为保底
if(touchedFloor > 0 && touchedFloor < id) { // 如果已经触发过保底了 if (touchedFloor > 0 && touchedFloor < id) { // 如果已经触发过保底了
// 更新被覆盖掉的那个保底数量 // 更新被覆盖掉的那个保底数量
updateUserFloor(floor, touchedFloor, false); updateUserFloor(floor, touchedFloor, false);
} }
@@ -89,7 +89,7 @@ export function getFloorResult(gachaId: number, base: number, floor: Floor[]) {
} }
} }
if(touchedFloor > 0) { if (touchedFloor > 0) {
updateUserFloor(floor, touchedFloor, true); updateUserFloor(floor, touchedFloor, true);
return gameData.gachaContentHero.get(touchedHeroQuality); return gameData.gachaContentHero.get(touchedHeroQuality);
} else { } else {
@@ -105,14 +105,14 @@ export function getFloorResult(gachaId: number, base: number, floor: Floor[]) {
*/ */
function updateUserFloor(floor: Floor[], id: number, needReset: boolean) { function updateUserFloor(floor: Floor[], id: number, needReset: boolean) {
let curFloor = floor.find(cur => cur.id == id); let curFloor = floor.find(cur => cur.id == id);
if(!curFloor) { if (!curFloor) {
curFloor = { id, count: 0 }; curFloor = { id, count: 0 };
floor.push(curFloor); floor.push(curFloor);
} }
if(needReset) { if (needReset) {
curFloor.count = 0; curFloor.count = 0;
} else { } else {
curFloor.count ++; curFloor.count++;
} }
} }
@@ -123,7 +123,7 @@ function updateUserFloor(floor: Floor[], id: number, needReset: boolean) {
*/ */
function countFloorPercent(id: number, floor: Floor[]) { function countFloorPercent(id: number, floor: Floor[]) {
let curFloor = floor.find(cur => cur.id == id); let curFloor = floor.find(cur => cur.id == id);
let count = curFloor?curFloor.count: 0; let count = curFloor ? curFloor.count : 0;
// 保底概率，暂时使用线性公式，由策划使用后选择 // 保底概率，暂时使用线性公式，由策划使用后选择
let floorCount = getDicGachaFloor(id); let floorCount = getDicGachaFloor(id);
return count / floorCount; return count / floorCount;
@@ -134,11 +134,11 @@ function countFloorPercent(id: number, floor: Floor[]) {
* @param id 保底类型id in GACHA_FLOOR_TYPE * @param id 保底类型id in GACHA_FLOOR_TYPE
*/ */
function getHeroQuality(id: number) { function getHeroQuality(id: number) {
if(id == GACHA_FLOOR_TYPE.PURPLE) { if (id == GACHA_FLOOR_TYPE.PURPLE) {
return HERO_QUALITY_TYPE.PURPLE; return HERO_QUALITY_TYPE.PURPLE;
} else if (id == GACHA_FLOOR_TYPE.GOLD) { } else if (id == GACHA_FLOOR_TYPE.GOLD) {
return HERO_QUALITY_TYPE.GOLD; return HERO_QUALITY_TYPE.GOLD;
} else if ( id == GACHA_FLOOR_TYPE.ASSIGN) { } else if (id == GACHA_FLOOR_TYPE.ASSIGN) {
return 0 return 0
} else { } else {
return false; return false;
@@ -154,7 +154,7 @@ function getHeroQuality(id: number) {
export function getResultFromContentId(contentId: number, lv: number, hope: Hope[]) { export function getResultFromContentId(contentId: number, lv: number, hope: Hope[]) {
let dic = gameData.gachaContent.get(contentId); let dic = gameData.gachaContent.get(contentId);
let { type, param, count } = dic; let { type, param, count } = dic;
if(type == GACHA_CONTENT_TYPE.HERO) { if (type == GACHA_CONTENT_TYPE.HERO) {
let pool: number[] = getPoolByHope(hope, param[0]); let pool: number[] = getPoolByHope(hope, param[0]);
let hero = getRandEelm(pool); let hero = getRandEelm(pool);
@@ -163,7 +163,7 @@ export function getResultFromContentId(contentId: number, lv: number, hope: Hope
return result return result
} else { } else {
let pool: number[] = []; let pool: number[] = [];
if(type == GACHA_CONTENT_TYPE.HERO_PIECE) { if (type == GACHA_CONTENT_TYPE.HERO_PIECE) {
pool = getAllItemByQuality(IT_TYPE.HERO_PIECE, param[0], lv); pool = getAllItemByQuality(IT_TYPE.HERO_PIECE, param[0], lv);
} else if (type == GACHA_CONTENT_TYPE.BLUEPRT) { } else if (type == GACHA_CONTENT_TYPE.BLUEPRT) {
pool = getAllItemByQuality(IT_TYPE.BLUEPRT, param[0], lv); pool = getAllItemByQuality(IT_TYPE.BLUEPRT, param[0], lv);
@@ -187,29 +187,29 @@ export function getResultFromContentId(contentId: number, lv: number, hope: Hope
* @param qualtiy 武将品质 * @param qualtiy 武将品质
*/ */
function getPoolByHope(hope: Hope[], qualtiy: number) { function getPoolByHope(hope: Hope[], qualtiy: number) {
if(qualtiy == HERO_QUALITY_TYPE.GOLD) { if (qualtiy == HERO_QUALITY_TYPE.GOLD) {
let hopeMap = new Map<number, Hope>(); let hopeMap = new Map<number, Hope>();
let hasGetHope: number[] = []; let hasGetHope: number[] = [];
for(let h of hope) { for (let h of hope) {
if(h.hid > 0) { if (h.hid > 0) {
hopeMap.set(h.id, h); hopeMap.set(h.id, h);
if(h.hasGet) hasGetHope.push(h.id); if (h.hasGet) hasGetHope.push(h.id);
} }
} }
let list = gameData.gachaHope.map(cur => { let list = gameData.gachaHope.map(cur => {
return {...cur, hasGet: hopeMap.get(cur.id)?.hasGet||false}; return { ...cur, hasGet: hopeMap.get(cur.id)?.hasGet || false };
}) })
let { dic: { id, hasGet } } = getRandEelmWithWeight(list); let { dic: { id, hasGet } } = getRandEelmWithWeight(list);
if(id == 0 || hasGet) { if (id == 0 || hasGet) {
return getAllHeroByQuality(qualtiy).filter(cur => !hasGetHope.includes(cur) ); return getAllHeroByQuality(qualtiy).filter(cur => !hasGetHope.includes(cur));
} else { } else {
if(hopeMap.has(id)) { if (hopeMap.has(id)) {
let curHope = hopeMap.get(id); let curHope = hopeMap.get(id);
curHope.hasGet = true; curHope.hasGet = true;
return [curHope.hid]; return [curHope.hid];
} else { } else {
return getAllHeroByQuality(qualtiy).filter(cur => !hasGetHope.includes(cur) ); return getAllHeroByQuality(qualtiy).filter(cur => !hasGetHope.includes(cur));
} }
} }
} else { } else {
@@ -222,20 +222,20 @@ function getPoolByHope(hope: Hope[], qualtiy: number) {
* @param quality 品质 * @param quality 品质
*/ */
export function getAllHeroByQuality(quality: number) { export function getAllHeroByQuality(quality: number) {
if(quality == 0) return [ GACHA_OCCUPY_HID ]; if (quality == 0) return [GACHA_OCCUPY_HID];
let allHero: number[] = []; let allHero: number[] = [];
let allQuality: number[] = []; let allQuality: number[] = [];
for(let { actorId } of gameData.recruit) { for (let { actorId } of gameData.recruit) {
let dicHero = gameData.hero.get(actorId); let dicHero = gameData.hero.get(actorId);
if(dicHero.quality == quality) { if (dicHero.quality == quality) {
allHero.push(actorId); allHero.push(actorId);
} }
if(allQuality.indexOf(dicHero.quality) == -1) allQuality.push(dicHero.quality); if (allQuality.indexOf(dicHero.quality) == -1) allQuality.push(dicHero.quality);
} }
allQuality.sort((a, b) => a - b); allQuality.sort((a, b) => a - b);
if(allQuality.length == 0) return []; if (allQuality.length == 0) return [];
if(allHero.length == 0) { if (allHero.length == 0) {
allHero = getAllHeroByQuality(allQuality[0]); allHero = getAllHeroByQuality(allQuality[0]);
} }
return allHero; return allHero;
@@ -243,9 +243,9 @@ export function getAllHeroByQuality(quality: number) {
function getAllItemByQuality(itid: number, quality: number, lv: number) { function getAllItemByQuality(itid: number, quality: number, lv: number) {
let allPiece: number[] = []; let allPiece: number[] = [];
for(let [ id, dicGoods ] of gameData.goods) { for (let [id, dicGoods] of gameData.goods) {
if(dicGoods.itid == itid) { if (dicGoods.itid == itid) {
if((quality == 0 || dicGoods.quality == quality) || dicGoods.lvLimited <= lv) { if ((quality == 0 || dicGoods.quality == quality) || dicGoods.lvLimited <= lv) {
allPiece.push(id); allPiece.push(id);
} }
} }
@@ -255,13 +255,13 @@ function getAllItemByQuality(itid: number, quality: number, lv: number) {
function getAllJewelByLv(lv: number) { function getAllJewelByLv(lv: number) {
let itids: number[] = []; let itids: number[] = [];
for(let [ id, { type } ] of ITID) { for (let [id, { type }] of ITID) {
if(type == CONSUME_TYPE.JEWEL) itids.push(id); if (type == CONSUME_TYPE.JEWEL) itids.push(id);
} }
let items: number[] = []; let items: number[] = [];
for(let [ id, dicGoods ] of gameData.goods) { for (let [id, dicGoods] of gameData.goods) {
if(itids.includes(dicGoods.itid)) { if (itids.includes(dicGoods.itid)) {
if(lv == 0 || dicGoods.lvLimited == lv) { if (lv == 0 || dicGoods.lvLimited == lv) {
items.push(id); items.push(id);
} }
} }
@@ -271,9 +271,9 @@ function getAllJewelByLv(lv: number) {
function getSuitPaper(lv: number) { function getSuitPaper(lv: number) {
let items: number[] = []; let items: number[] = [];
for(let [ id, dicGoods ] of gameData.goods) { for (let [id, dicGoods] of gameData.goods) {
if(dicGoods.itid == IT_TYPE.PAPER) { if (dicGoods.itid == IT_TYPE.PAPER) {
if(dicGoods.lvLimited <= lv) { if (dicGoods.lvLimited <= lv) {
items.push(id); items.push(id);
} }
} }
game-server/app/services/growthFundService.ts
+2 -2
View File
@@ -22,7 +22,7 @@ import { GrowthFundData, GrowthFundItem } from '../domain/activityField/growthFu
GROWTH_FUND_MAIN_ELITE_VIP = 11, // 精英成长基金（高阶） GROWTH_FUND_MAIN_ELITE_VIP = 11, // 精英成长基金（高阶）
*/ */
export async function growthFundActivity(type: number, serverId: number, roleId: string) { export async function growthFundActivity(type: number, serverId: number, roleId: string) {
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(type, true) let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, type, true)
activityArray = activityArray.sort((a, b) => { activityArray = activityArray.sort((a, b) => {
return a.activityId - b.activityId return a.activityId - b.activityId
}); });
@@ -45,7 +45,7 @@ export async function growthFundActivity(type: number, serverId: number, roleId:
* *
*/ */
export async function getPlayerGrowthFundData(activityId: number, serverId: number, roleId: string) { export async function getPlayerGrowthFundData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true); let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerRecords: ActivityGrowthFundModelType[] = await ActivityGrowthFundModel.findData(activityId, roleId); let playerRecords: ActivityGrowthFundModelType[] = await ActivityGrowthFundModel.findData(activityId, roleId);
let playerData = new GrowthFundData(activityData); let playerData = new GrowthFundData(activityData);
game-server/app/services/growthService.ts
+4 -3
View File
@@ -1,3 +1,4 @@
import { ACTIVITY_TYPE } from '../consts';
import { ActivityModel, ActivityModelType } from '../db/Activity'; import { ActivityModel, ActivityModelType } from '../db/Activity';
import { ActivityGrowthModel, ActivityGrowthModelType } from '../db/ActivityGrowth'; import { ActivityGrowthModel, ActivityGrowthModelType } from '../db/ActivityGrowth';
import { GrowthData, GrowthItem } from '../domain/activityField/growthField'; import { GrowthData, GrowthItem } from '../domain/activityField/growthField';
@@ -10,8 +11,8 @@ import { GrowthData, GrowthItem } from '../domain/activityField/growthField';
* @param {string} roleId 角色Id * @param {string} roleId 角色Id
* *
*/ */
export async function getActivityData(activityId: number, serverId: number, roleId: string) { export async function getGrowthActivityData(serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true); let activityData: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.TASK_GROWTH, new Date());
return { data: activityData }; return { data: activityData };
} }
@@ -24,7 +25,7 @@ export async function getActivityData(activityId: number, serverId: number, role
* *
*/ */
export async function getPlayerGrowthData(activityId: number, serverId: number, roleId: string) { export async function getPlayerGrowthData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true); let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerRecords: ActivityGrowthModelType[] = await ActivityGrowthModel.findData(serverId, activityId, roleId); let playerRecords: ActivityGrowthModelType[] = await ActivityGrowthModel.findData(serverId, activityId, roleId);
let playerData = new GrowthData(activityData); let playerData = new GrowthData(activityData);
game-server/app/services/guildService.ts
+1 -1
View File
@@ -93,7 +93,7 @@ export async function joinGuild(code: string, guildName: string, lv: number, rol
} }
//成长任务-加入军团 //成长任务-加入军团
await accomplishTask(roleId, TASK_TYPE.GUILD_JOIN, 1); await accomplishTask(serverId, roleId, TASK_TYPE.GUILD_JOIN, 1);
session.set('guildCode', code); session.set('guildCode', code);
session.push('guildCode', () => { }); session.push('guildCode', () => { });
game-server/app/services/limitPackageService.ts
+3 -3
View File
@@ -13,7 +13,7 @@ import { LimitShopData, ShopItem } from '../domain/activityField/limitShopField'
*/ */
export async function newPlayerLimitPackageActivity(serverId: number, roleId: string) { export async function newPlayerLimitPackageActivity(serverId: number, roleId: string) {
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(ACTIVITY_TYPE.NEW_PLAYER_LIMIT_PACKAGE, new Date) let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.NEW_PLAYER_LIMIT_PACKAGE, new Date)
activityArray = activityArray.sort((a, b) => { activityArray = activityArray.sort((a, b) => {
return b.activityId - a.activityId return b.activityId - a.activityId
}); });
@@ -34,7 +34,7 @@ export async function newPlayerLimitPackageActivity(serverId: number, roleId: st
* *
*/ */
export async function getPlayerLimitPackageData(activityId: number, serverId: number, roleId: string) { export async function getPlayerLimitPackageData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true); let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerData = new LimitShopData(activityData); let playerData = new LimitShopData(activityData);
let playerRecord: ActivityShopModelType = await ActivityShopModel.findData(activityId, roleId, playerData.roundIndex); let playerRecord: ActivityShopModelType = await ActivityShopModel.findData(activityId, roleId, playerData.roundIndex);
@@ -53,7 +53,7 @@ export async function getPlayerLimitPackageData(activityId: number, serverId: nu
*/ */
export async function limitPackageActivity(serverId: number, roleId: string, type: number) { export async function limitPackageActivity(serverId: number, roleId: string, type: number) {
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(type, new Date) let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, type, new Date)
activityArray = activityArray.sort((a, b) => { activityArray = activityArray.sort((a, b) => {
return b.activityId - a.activityId return b.activityId - a.activityId
}); });
game-server/app/services/monthlyTicketService.ts
+4 -4
View File
@@ -16,7 +16,7 @@ import moment = require('moment');
*/ */
export async function monthlyTicketActivity(serverId: number, roleId: string, type: number) { export async function monthlyTicketActivity(serverId: number, roleId: string, type: number) {
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(type, new Date()) let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, type, new Date())
activityArray = activityArray.sort((a, b) => { activityArray = activityArray.sort((a, b) => {
return b.activityId - a.activityId return b.activityId - a.activityId
}); });
@@ -37,7 +37,7 @@ export async function monthlyTicketActivity(serverId: number, roleId: string, ty
* *
*/ */
export async function getPlayerMonthlyTicketData(activityId: number, serverId: number, roleId: string) { export async function getPlayerMonthlyTicketData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true); let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerRecord: ActivityMonthlyTicketModelType = await ActivityMonthlyTicketModel.findMonthlyTicket(serverId, roleId, activityId); let playerRecord: ActivityMonthlyTicketModelType = await ActivityMonthlyTicketModel.findMonthlyTicket(serverId, roleId, activityId);
let playerData = new MonthlyTicketData(activityData); let playerData = new MonthlyTicketData(activityData);
playerData.setPlayerRecords(playerRecord); playerData.setPlayerRecords(playerRecord);
@@ -54,7 +54,7 @@ export async function getPlayerMonthlyTicketData(activityId: number, serverId: n
*/ */
export async function getPlayerMonthlyTicketDayReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[], export async function getPlayerMonthlyTicketDayReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
activityId: number,) { activityId: number,) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true); let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerRecord: ActivityMonthlyTicketModelType = await ActivityMonthlyTicketModel.findMonthlyTicket(serverId, roleId, activityId); let playerRecord: ActivityMonthlyTicketModelType = await ActivityMonthlyTicketModel.findMonthlyTicket(serverId, roleId, activityId);
if (!playerRecord) {//没有购买过 if (!playerRecord) {//没有购买过
return null; return null;
@@ -84,7 +84,7 @@ export async function getPlayerMonthlyTicketDayReward(roleId: string, roleName:
*/ */
export async function makeMonthlyTicketReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[], export async function makeMonthlyTicketReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
activityId: number, productID: string) { activityId: number, productID: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true); let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerData = new MonthlyTicketData(activityData); let playerData = new MonthlyTicketData(activityData);
let endTime = moment(new Date()).startOf('d').add(playerData.days, 'day').toDate(); let endTime = moment(new Date()).startOf('d').add(playerData.days, 'day').toDate();
game-server/app/services/normalBattleService.ts
+3 -2
View File
@@ -12,6 +12,7 @@ import { checkTask } from './taskService';
import { accomplishTask } from '../pubUtils/taskUtil'; import { accomplishTask } from '../pubUtils/taskUtil';
export async function roleLevelup(roleId: string, kingExp: number, session: BackendSession) { export async function roleLevelup(roleId: string, kingExp: number, session: BackendSession) {
const serverId = session.get('serverId');
let role = await RoleModel.findByRoleId(roleId); let role = await RoleModel.findByRoleId(roleId);
let { lv = 1, exp = 0 } = role; let { lv = 1, exp = 0 } = role;
let canGetExp = lv < gameData.maxPlayerLv; // 当主公超过最大级后，挑战结算不再获得经验值 let canGetExp = lv < gameData.maxPlayerLv; // 当主公超过最大级后，挑战结算不再获得经验值
@@ -35,10 +36,10 @@ export async function roleLevelup(roleId: string, kingExp: number, session: Back
// 任务 // 任务
await checkTask(roleId, session.get('sid'), session.get('funcs'), TASK_TYPE.ROLE_LV, newLv, false, {}); await checkTask(roleId, session.get('sid'), session.get('funcs'), TASK_TYPE.ROLE_LV, newLv, false, {});
//成长任务 //成长任务
await accomplishTask(roleId, TASK_TYPE.ROLE_LV, newLv); await accomplishTask(serverId, roleId, TASK_TYPE.ROLE_LV, newLv);
} }
let actordata: {lv: number, exp: number, getExp: number, mostExp: number}[] = []; let actordata: { lv: number, exp: number, getExp: number, mostExp: number }[] = [];
for (let i = lv; i <= newLv; i++) { for (let i = lv; i <= newLv; i++) {
let lvObj = getExpByLv(i); let lvObj = getExpByLv(i);
game-server/app/services/popUpShopService.ts
+3 -3
View File
@@ -15,7 +15,7 @@ import { ActivityPopUpShopModel, ActivityPopUpShopModelType } from '../db/Activi
*/ */
export async function popUpShopActivity(serverId: number, roleId: string) { export async function popUpShopActivity(serverId: number, roleId: string) {
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(ACTIVITY_TYPE.POP_UP_SHOP, new Date()) let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.POP_UP_SHOP, new Date())
activityArray = activityArray.sort((a, b) => { activityArray = activityArray.sort((a, b) => {
return b.activityId - a.activityId return b.activityId - a.activityId
}); });
@@ -36,7 +36,7 @@ export async function popUpShopActivity(serverId: number, roleId: string) {
* *
*/ */
export async function getPlayerPopUpShopData(activityId: number, serverId: number, roleId: string) { export async function getPlayerPopUpShopData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true); let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerRecords: ActivityPopUpShopModelType[] = await ActivityPopUpShopModel.findAllOpenData(serverId, activityId, roleId); let playerRecords: ActivityPopUpShopModelType[] = await ActivityPopUpShopModel.findAllOpenData(serverId, activityId, roleId);
let allPlayerShop = []; let allPlayerShop = [];
@@ -65,7 +65,7 @@ export async function getPlayerPopUpShopData(activityId: number, serverId: numbe
*/ */
export async function makePopUpShopReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[], export async function makePopUpShopReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
activityId: number, productID: string) { activityId: number, productID: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true); let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
if (!activityData) { if (!activityData) {
return null; return null;
} }
game-server/app/services/rechargeMoneyService.ts
+2 -2
View File
@@ -17,7 +17,7 @@ import moment = require('moment');
*/ */
export async function rechargeMoneyActivity(serverId: number, roleId: string) { export async function rechargeMoneyActivity(serverId: number, roleId: string) {
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(ACTIVITY_TYPE.RECHARGE_MONEY, new Date()) let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.RECHARGE_MONEY, new Date())
activityArray = activityArray.sort((a, b) => { activityArray = activityArray.sort((a, b) => {
return b.activityId - a.activityId return b.activityId - a.activityId
}); });
@@ -38,7 +38,7 @@ export async function rechargeMoneyActivity(serverId: number, roleId: string) {
* *
*/ */
export async function getPlayerRechargeMoneyData(activityId: number, serverId: number, roleId: string) { export async function getPlayerRechargeMoneyData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true); let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerRecord: ActivityRechargeMoneyModelType[] = await ActivityRechargeMoneyModel.findData(serverId, roleId); let playerRecord: ActivityRechargeMoneyModelType[] = await ActivityRechargeMoneyModel.findData(serverId, roleId);
let playerData = new RechargeMoneyData(activityData); let playerData = new RechargeMoneyData(activityData);
game-server/app/services/selfServiceShopActivityService.ts
+2 -2
View File
@@ -16,7 +16,7 @@ import { addReward, getSelectedReward } from './giftPackageService';
* *
*/ */
export async function getActivityData(serverId: number, roleId: string) { export async function getActivityData(serverId: number, roleId: string) {
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(ACTIVITY_TYPE.SELF_SERVICE_SHOP, new Date()) let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.SELF_SERVICE_SHOP, new Date())
activityArray = activityArray.sort((a, b) => { activityArray = activityArray.sort((a, b) => {
return b.activityId - a.activityId return b.activityId - a.activityId
}); });
@@ -37,7 +37,7 @@ export async function getActivityData(serverId: number, roleId: string) {
* *
*/ */
export async function getPlayerActivityData(activityId: number, serverId: number, roleId: string) { export async function getPlayerActivityData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true); let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerData = new SelfServiceShopData(activityData); let playerData = new SelfServiceShopData(activityData);
let playerRecords: ActivitySelfServiceShopModelType[] = await ActivitySelfServiceShopModel.findDataByPriceType(serverId, activityId, roleId, playerData.roundIndex, ACTIVITY_RESOURCES_TYPE.RMB); let playerRecords: ActivitySelfServiceShopModelType[] = await ActivitySelfServiceShopModel.findDataByPriceType(serverId, activityId, roleId, playerData.roundIndex, ACTIVITY_RESOURCES_TYPE.RMB);
game-server/app/services/signInService.ts
+3 -3
View File
@@ -14,7 +14,7 @@ import { SignInData, SignInItem } from '../domain/activityField/signInField';
* *
*/ */
export async function signInActivity(type: number, serverId: number, roleId: string) { export async function signInActivity(type: number, serverId: number, roleId: string) {
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(type, new Date()); let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, type, new Date());
if (activityArray.length > 0) { if (activityArray.length > 0) {
return activityArray[0]; return activityArray[0];
} }
@@ -30,7 +30,7 @@ export async function signInActivity(type: number, serverId: number, roleId: str
* *
*/ */
export async function getPlayerSignInData(activityId: number, serverId: number, roleId: string) { export async function getPlayerSignInData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true); let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerData = new SignInData(activityData); let playerData = new SignInData(activityData);
let playerRecords: ActivitySignInModelType[] = await ActivitySignInModel.findData(activityId, roleId, playerData.roundIndex); let playerRecords: ActivitySignInModelType[] = await ActivitySignInModel.findData(activityId, roleId, playerData.roundIndex);
@@ -51,7 +51,7 @@ export async function getPlayerSignInData(activityId: number, serverId: number,
*/ */
export async function makeSignInVIP(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[], export async function makeSignInVIP(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
activityId: number, productID: string) { activityId: number, productID: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true); let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerData = new SignInData(activityData); let playerData = new SignInData(activityData);
await ActivitySignInModel.buyVIP(activityId, roleId, playerData.roundIndex); await ActivitySignInModel.buyVIP(activityId, roleId, playerData.roundIndex);
game-server/app/services/taskService.ts
+6 -6
View File
@@ -16,16 +16,16 @@ import { gameData, getGoodById } from '../pubUtils/data';
import { getSeconds, getZeroPointD } from '../pubUtils/timeUtil'; import { getSeconds, getZeroPointD } from '../pubUtils/timeUtil';
import { RoleStatus } from '../db/ComBattleTeam'; import { RoleStatus } from '../db/ComBattleTeam';
export async function checkTaskWithRoles(roleId: string, sid: string, funcs: number[], taskType: number, roles: RoleType[]) { export async function checkTaskWithRoles(serverId: number, roleId: string, sid: string, funcs: number[], taskType: number, roles: RoleType[]) {
for (let role of roles) { for (let role of roles) {
if (role) { if (role) {
await checkTaskWithRole(role.roleId, role.roleId == roleId ? sid : null, role.roleId == roleId ? funcs : null, taskType, role); await checkTaskWithRole(serverId, role.roleId, role.roleId == roleId ? sid : null, role.roleId == roleId ? funcs : null, taskType, role);
} }
} }
} }
export async function checkTaskWithRole(roleId: string, sid: string, funcs: number[], taskType: number, role: RoleType) { export async function checkTaskWithRole(serverId: number, roleId: string, sid: string, funcs: number[], taskType: number, role: RoleType) {
let pushMessage = await taskUtil.checkTaskWithRole(roleId, taskType, role, funcs); let pushMessage = await taskUtil.checkTaskWithRole(serverId, roleId, taskType, role, funcs);
pushTaskUpdate(roleId, sid, funcs, pushMessage); pushTaskUpdate(roleId, sid, funcs, pushMessage);
} }
@@ -76,7 +76,7 @@ export async function pushTaskUpdate(roleId: string, sid: string, funcs: number[
/** /**
* battle.normalBattleHandler.battleEnd 中会触发的任务，因为有点多提出来了 * battle.normalBattleHandler.battleEnd 中会触发的任务，因为有点多提出来了
*/ */
export async function checkTaskInBattleEnd(roleId: string, sid: string, funcs: number[], battleId: number, heroes: number[], star: number) { export async function checkTaskInBattleEnd(serverId: number, roleId: string, sid: string, funcs: number[], battleId: number, heroes: number[], star: number) {
await checkTaskWithWar(roleId, sid, funcs, TASK_TYPE.BATTLE_WITH_HERO, battleId, heroes, 1, star); await checkTaskWithWar(roleId, sid, funcs, TASK_TYPE.BATTLE_WITH_HERO, battleId, heroes, 1, star);
await checkTaskWithWar(roleId, sid, funcs, TASK_TYPE.BATTLE_MAIN, battleId, heroes, 1, star); await checkTaskWithWar(roleId, sid, funcs, TASK_TYPE.BATTLE_MAIN, battleId, heroes, 1, star);
@@ -88,7 +88,7 @@ export async function checkTaskInBattleEnd(roleId: string, sid: string, funcs: n
await checkTaskWithWar(roleId, sid, funcs, TASK_TYPE.BATTLE_VESTIGE, battleId, heroes, 1, star); await checkTaskWithWar(roleId, sid, funcs, TASK_TYPE.BATTLE_VESTIGE, battleId, heroes, 1, star);
await checkTaskWithWar(roleId, sid, funcs, TASK_TYPE.BATTLE_EXPEDITION, battleId, heroes, 1, star); await checkTaskWithWar(roleId, sid, funcs, TASK_TYPE.BATTLE_EXPEDITION, battleId, heroes, 1, star);
//成长任务 //成长任务
await taskUtil.accomplishTask(roleId, TASK_TYPE.BATTLE_MAIN, 1, { warId: battleId }) await taskUtil.accomplishTask(serverId, roleId, TASK_TYPE.BATTLE_MAIN, 1, { warId: battleId })
} }
game-server/app/services/thirtyDaysService.ts
+3 -3
View File
@@ -18,7 +18,7 @@ import { deltaDays } from '../pubUtils/util';
*/ */
export async function thirtyDaysActivity(type: number, serverId: number, roleId: string) { export async function thirtyDaysActivity(type: number, serverId: number, roleId: string) {
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(type, true) let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, type, true)
activityArray = activityArray.sort((a, b) => { activityArray = activityArray.sort((a, b) => {
return a.activityId - b.activityId return a.activityId - b.activityId
}); });
@@ -41,7 +41,7 @@ export async function thirtyDaysActivity(type: number, serverId: number, roleId:
* *
*/ */
export async function getPlayerThirtyDaysData(activityId: number, serverId: number, roleId: string) { export async function getPlayerThirtyDaysData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true); let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerRecords: ActivityThirtyDaysModelType[] = await ActivityThirtyDaysModel.findData(serverId, activityId, roleId); let playerRecords: ActivityThirtyDaysModelType[] = await ActivityThirtyDaysModel.findData(serverId, activityId, roleId);
let playerPointRecords: ActivityThirtyDaysPointRewardModelType[] = await ActivityThirtyDaysPointRewardModel.findData(activityId, roleId); let playerPointRecords: ActivityThirtyDaysPointRewardModelType[] = await ActivityThirtyDaysPointRewardModel.findData(activityId, roleId);
@@ -60,7 +60,7 @@ export async function getPlayerThirtyDaysData(activityId: number, serverId: numb
* *
*/ */
export async function addPlayerThirtyDaysTask(activityId: number, serverId: number, roleId: string) { export async function addPlayerThirtyDaysTask(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true); let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerRecords: ActivityThirtyDaysModelType[] = await ActivityThirtyDaysModel.findData(serverId, activityId, roleId); let playerRecords: ActivityThirtyDaysModelType[] = await ActivityThirtyDaysModel.findData(serverId, activityId, roleId);
let playerPointRecords: ActivityThirtyDaysPointRewardModelType[] = await ActivityThirtyDaysPointRewardModel.findData(activityId, roleId); let playerPointRecords: ActivityThirtyDaysPointRewardModelType[] = await ActivityThirtyDaysPointRewardModel.findData(activityId, roleId);
game-server/app/services/yuanbaoService.ts
+3 -3
View File
@@ -15,7 +15,7 @@ import { addReward, stringToRewardParam } from './giftPackageService';
*/ */
export async function yuanbaoActivity(serverId: number, roleId: string) { export async function yuanbaoActivity(serverId: number, roleId: string) {
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(ACTIVITY_TYPE.YUAN_BAO_SHOP, true) let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, ACTIVITY_TYPE.YUAN_BAO_SHOP, true)
activityArray = activityArray.sort((a, b) => { activityArray = activityArray.sort((a, b) => {
return b.activityId - a.activityId return b.activityId - a.activityId
}); });
@@ -36,7 +36,7 @@ export async function yuanbaoActivity(serverId: number, roleId: string) {
* *
*/ */
export async function getPlayerYuanbaoShopData(activityId: number, serverId: number, roleId: string) { export async function getPlayerYuanbaoShopData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true); let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerRecord: UserOrderModelType[] = await UserOrderModel.findOrderByActivityID(activityId, roleId); let playerRecord: UserOrderModelType[] = await UserOrderModel.findOrderByActivityID(activityId, roleId);
let playerData = new YuanBaoShopData(activityData); let playerData = new YuanBaoShopData(activityData);
@@ -57,7 +57,7 @@ export async function getPlayerYuanbaoShopData(activityId: number, serverId: num
export async function makeYuanbaoShopReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[], export async function makeYuanbaoShopReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
activityId: number, productID: string) { activityId: number, productID: string) {
let records = await UserOrderModel.findOrderByProductID(productID, roleId, activityId); let records = await UserOrderModel.findOrderByProductID(productID, roleId, activityId);
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true); let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerData = new YuanBaoShopData(activityData); let playerData = new YuanBaoShopData(activityData);
let item = playerData.findItem(productID); let item = playerData.findItem(productID);
gm-server/app/service/Activity.ts
+11 -9
View File
@@ -16,32 +16,34 @@ export default class Activity extends Service {
const list = await ActivityModel.findByCondition(page, pageSize, type, serverId, current, activityId); const list = await ActivityModel.findByCondition(page, pageSize, type, serverId, current, activityId);
const total = await ActivityModel.countByCondition(type, serverId, current, activityId); const total = await ActivityModel.countByCondition(type, serverId, current, activityId);
return ctx.service.utils.resResult(STATUS.SUCCESS, { return ctx.service.utils.resResult(STATUS.SUCCESS, {
list: list.map(cur => { return { list: list.map(cur => {
...cur, beginTime: cur.beginTime.getTime(), endTime: cur.endTime.getTime() return {
} }), total ...cur, beginTime: cur.beginTime.getTime(), endTime: cur.endTime.getTime()
}
}), total
}); });
} }
public async updateActivity(activityId: number|string, serverId: number, beginTime: number, endTime: number, type: number, data: string) { public async updateActivity(activityId: number | string, serverId: number, beginTime: number, endTime: number, type: number, data: string) {
const { ctx } = this; const { ctx } = this;
if(!type || !data) { if (!type || !data) {
return ctx.service.utils.resResult(STATUS.WRONG_PARMS); return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
} }
try { try {
let result = JSON.parse(data); let result = JSON.parse(data);
ctx.service.utils.checkActivityData(result, type); ctx.service.utils.checkActivityData(result, type);
} catch(e) { } catch (e) {
return ctx.service.utils.resResult(STATUS.WRONG_PARMS); return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
} }
let aids: number[] = []; let aids: number[] = [];
if(typeof activityId == 'number') { if (typeof activityId == 'number') {
aids.push(activityId); aids.push(activityId);
} else { } else {
activityId.split(',').forEach(aidStr => { activityId.split(',').forEach(aidStr => {
aids.push(parseInt(aidStr)); aids.push(parseInt(aidStr));
}); });
} }
const activity = await ActivityModel.addActivity(aids, serverId, beginTime?new Date(beginTime): undefined, endTime?new Date(endTime): undefined, type, data); const activity = await ActivityModel.addActivity(aids, serverId, beginTime ? new Date(beginTime) : undefined, endTime ? new Date(endTime) : undefined, type, data);
return ctx.service.utils.resResult(STATUS.SUCCESS, { return ctx.service.utils.resResult(STATUS.SUCCESS, {
activity activity
}) })
@@ -50,7 +52,7 @@ export default class Activity extends Service {
public async deleteActivity(activityId: number) { public async deleteActivity(activityId: number) {
const { ctx } = this; const { ctx } = this;
const result = await ActivityModel.deleteActivity(activityId); const result = await ActivityModel.deleteActivity(activityId);
if(result) { if (result) {
return ctx.service.utils.resResult(STATUS.SUCCESS); return ctx.service.utils.resResult(STATUS.SUCCESS);
} else { } else {
return ctx.service.utils.resResult(STATUS.ACTIVITY_MISSING); return ctx.service.utils.resResult(STATUS.ACTIVITY_MISSING);
shared/consts/constModules/activityConst.ts
+1 -1
View File
@@ -88,7 +88,7 @@ export enum ORDER_STATE {
} }
//服务器开服时间 //服务器开服时间
export const SERVER_OPEN_TIME = '2021-02-11T20:03:16.637+08:00'; export const SERVER_OPEN_TIME = '2021-05-19T20:03:16.637+08:00';
//玩家等级大于等于15级才能开启vip签到 //玩家等级大于等于15级才能开启vip签到
export const SIGNIN_VIP_OPEN_LIMIT = 15; export const SIGNIN_VIP_OPEN_LIMIT = 15;
shared/db/Activity.ts
+21 -21
View File
@@ -23,39 +23,39 @@ export default class Activity extends BaseModel {
data: string; // 活动表中的数据 data: string; // 活动表中的数据
//根据活动类型查询开启的活动数据 //根据活动类型查询开启的活动数据
public static async findOpenActivityByType(type: number, date: Date, lean = true) { public static async findOpenActivityByType(serverId: number, type: number, date: Date, lean = true) {
let result: ActivityModelType[] = await ActivityModel.find({ type, beginTime: { $lte: date }, endTime: { $gte: date } }).lean(lean); let result: ActivityModelType[] = await ActivityModel.find({ serverId, type, beginTime: { $lte: date }, endTime: { $gte: date } }).lean(lean);
return result; return result;
} }
//根据活动类型查询活动数据 //根据活动类型查询活动数据
public static async findActivityByType(type: number, lean = true) { public static async findActivityByType(serverId: number, type: number, lean = true) {
let result: ActivityModelType[] = await ActivityModel.find({ type }).lean(lean); let result: ActivityModelType[] = await ActivityModel.find({ serverId, type }).lean(lean);
return result; return result;
} }
//根据活动id查询活动数据 //根据活动id查询活动数据
public static async findActivity(activityId: number, lean = true) { public static async findActivity(serverId: number, activityId: number, lean = true) {
let result: ActivityModelType = await ActivityModel.findOne({ activityId }).lean(lean); let result: ActivityModelType = await ActivityModel.findOne({ serverId, activityId }).lean(lean);
return result; return result;
} }
//新增活动 //新增活动
public static async addActivity(aids: number[], serverId: number, beginTime: Date, endTime: Date, type: number, data: string, lean = true) { public static async addActivity(aids: number[], serverId: number, beginTime: Date, endTime: Date, type: number, data: string, lean = true) {
let result: ActivityModelType[] = []; let result: ActivityModelType[] = [];
for(let activityId of aids) { for (let activityId of aids) {
if(!activityId) activityId = await CounterModel.getNewCounter(COUNTER.ACTIVITY); if (!activityId) activityId = await CounterModel.getNewCounter(COUNTER.ACTIVITY);
let update = { type, data } let update = { type, data }
if(serverId != undefined) { if (serverId != undefined) {
update["serverId"] = serverId; update["serverId"] = serverId;
} }
if(beginTime != undefined) { if (beginTime != undefined) {
update["beginTime"] = beginTime; update["beginTime"] = beginTime;
} }
if(endTime != undefined) { if (endTime != undefined) {
update["endTime"] = endTime; update["endTime"] = endTime;
} }
let rec: ActivityModelType = await ActivityModel.findOneAndUpdate({ activityId }, {$set: update}, let rec: ActivityModelType = await ActivityModel.findOneAndUpdate({ activityId }, { $set: update },
{ new: true, upsert: true }).lean(lean); { new: true, upsert: true }).lean(lean);
result.push(rec); result.push(rec);
} }
@@ -71,24 +71,24 @@ export default class Activity extends BaseModel {
//查询 //查询
public static async findByCondition(page: number, pageSize: number, type: number = 0, serverId: number = 0, current: boolean = false, activityId: number = 0) { public static async findByCondition(page: number, pageSize: number, type: number = 0, serverId: number = 0, current: boolean = false, activityId: number = 0) {
let searchObj = {}; let searchObj = {};
if(type != 0) searchObj['type'] = type; if (type != 0) searchObj['type'] = type;
if(serverId != 0) searchObj['serverId'] = { $in: [0, serverId] }; if (serverId != 0) searchObj['serverId'] = { $in: [0, serverId] };
if(activityId != 0) searchObj['activityId'] = activityId; if (activityId != 0) searchObj['activityId'] = activityId;
if(current) { if (current) {
searchObj['beginTime'] = { $lte: new Date }; searchObj['beginTime'] = { $lte: new Date };
searchObj['endTime'] = { $gte: new Date }; searchObj['endTime'] = { $gte: new Date };
} }
const result: ActivityModelType[] = await ActivityModel.find(searchObj, { _id: 0 }).limit(pageSize).skip((page - 1) * pageSize).sort({updatedAt: -1}).lean(); const result: ActivityModelType[] = await ActivityModel.find(searchObj, { _id: 0 }).limit(pageSize).skip((page - 1) * pageSize).sort({ updatedAt: -1 }).lean();
return result; return result;
} }
// 获得活动数量 // 获得活动数量
public static async countByCondition(type: number = 0, serverId: number = 0, current: boolean = false, activityId: number = 0) { public static async countByCondition(type: number = 0, serverId: number = 0, current: boolean = false, activityId: number = 0) {
let searchObj = {}; let searchObj = {};
if(type != 0) searchObj['type'] = type; if (type != 0) searchObj['type'] = type;
if(serverId != 0) searchObj['serverId'] = { $in: [0, serverId] }; if (serverId != 0) searchObj['serverId'] = { $in: [0, serverId] };
if(activityId != 0) searchObj['activityId'] = activityId; if (activityId != 0) searchObj['activityId'] = activityId;
if(current) { if (current) {
searchObj['beginTime'] = { $lte: new Date }; searchObj['beginTime'] = { $lte: new Date };
searchObj['endTime'] = { $gte: new Date }; searchObj['endTime'] = { $gte: new Date };
} }
shared/pubUtils/itemUtils.ts
+2 -2
View File
@@ -246,7 +246,7 @@ export async function createHeroes(roleId: string, roleName: string, serverId: n
let dicHero = gameData.hero.get(heroInfo.hid); let dicHero = gameData.hero.get(heroInfo.hid);
let { quality, initialStars: star, jobid: job, name: hName, initialSkin } = dicHero; let { quality, initialStars: star, jobid: job, name: hName, initialSkin } = dicHero;
let info = { roleId, roleName, serverId, quality, star, job, hName, skins: [{id: initialSkin, enable: true}] }; let info = { roleId, roleName, serverId, quality, star, job, hName, skins: [{ id: initialSkin, enable: true }] };
let curHero = await HeroModel.createHero(Object.assign(info, heroInfo)); let curHero = await HeroModel.createHero(Object.assign(info, heroInfo));
let calHeroResult = await calPlayerCeAndSave(HERO_SYSTEM_TYPE.INIT, roleId, curHero, {}); calHeroResults.push(calHeroResult); let calHeroResult = await calPlayerCeAndSave(HERO_SYSTEM_TYPE.INIT, roleId, curHero, {}); calHeroResults.push(calHeroResult);
let calAllHeroResult = await reCalAllHeroCe(HERO_SYSTEM_TYPE.ADD_SKIN, roleId, {}, skinIds); calAllHeroResults.push(calAllHeroResult); let calAllHeroResult = await reCalAllHeroCe(HERO_SYSTEM_TYPE.ADD_SKIN, roleId, {}, skinIds); calAllHeroResults.push(calAllHeroResult);
@@ -268,7 +268,7 @@ export async function createHeroes(roleId: string, roleName: string, serverId: n
let m4 = await checkTaskWithHeroes(roleId, TASK_TYPE.HERO_LV, heroes, funcs); let m4 = await checkTaskWithHeroes(roleId, TASK_TYPE.HERO_LV, heroes, funcs);
let taskPushMessage = m1.concat(m2, m3, m4); let taskPushMessage = m1.concat(m2, m3, m4);
//成长任务 //成长任务
await accomplishTask(roleId, TASK_TYPE.HERO_NUM, heroNum) await accomplishTask(serverId, roleId, TASK_TYPE.HERO_NUM, heroNum)
return { role, figureInfo, heroes, calHeroResults, calAllHeroResults, taskPushMessage } return { role, figureInfo, heroes, calHeroResults, calAllHeroResults, taskPushMessage }
} }
shared/pubUtils/taskUtil.ts
+9 -9
View File
@@ -20,18 +20,18 @@ import { ActivityThirtyDaysModel, ActivityThirtyDaysModelType } from '../db/Acti
export async function checkTaskWithRoles(taskType: number, roles: RoleType[], funcs?: number[]) { export async function checkTaskWithRoles(serverId: number, taskType: number, roles: RoleType[], funcs?: number[]) {
let pushMessage = new Array<TaskListReturn>(); let pushMessage = new Array<TaskListReturn>();
for (let role of roles) { for (let role of roles) {
if (role) { if (role) {
let singlePush = await checkTaskWithRole(role.roleId, taskType, role, funcs); let singlePush = await checkTaskWithRole(serverId, role.roleId, taskType, role, funcs);
pushMessage.concat(singlePush); pushMessage.concat(singlePush);
} }
} }
return pushMessage return pushMessage
} }
export async function checkTaskWithRole(roleId: string, taskType: number, role: RoleType, funcs?: number[]) { export async function checkTaskWithRole(serverId: number, roleId: string, taskType: number, role: RoleType, funcs?: number[]) {
let pushMessage = new Array<TaskListReturn>(); let pushMessage = new Array<TaskListReturn>();
if (taskType == TASK_TYPE.LOGIN_SUM) { if (taskType == TASK_TYPE.LOGIN_SUM) {
@@ -39,7 +39,7 @@ export async function checkTaskWithRole(roleId: string, taskType: number, role:
if (today > role.loginTime) { if (today > role.loginTime) {
pushMessage = await checkTask(roleId, taskType, 1, true, {}, funcs); pushMessage = await checkTask(roleId, taskType, 1, true, {}, funcs);
//成长任务-累计登录游戏天数 //成长任务-累计登录游戏天数
await accomplishTask(roleId, taskType, 1) await accomplishTask(serverId, roleId, taskType, 1)
} }
} }
else if (taskType == TASK_TYPE.LOGIN_SERIES) { else if (taskType == TASK_TYPE.LOGIN_SERIES) {
@@ -481,9 +481,9 @@ function checkRecResult(rec: UserTaskRecType, id: number) {
* @param {number} parma 参数 * @param {number} parma 参数
* *
*/ */
export async function accomplishTask(roleId: string, taskType: TASK_TYPE, count: number, parma?: any) { export async function accomplishTask(serverId: number, roleId: string, taskType: TASK_TYPE, count: number, parma?: any) {
//成长活动统计 //七天乐-成长活动统计
let allActivity: ActivityModelType[] = await ActivityModel.findOpenActivityByType(ACTIVITY_TYPE.TASK_GROWTH, new Date()); let allActivity: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.TASK_GROWTH, new Date());
for (let activity of allActivity) { for (let activity of allActivity) {
let growthActivity = new GrowthData(activity); let growthActivity = new GrowthData(activity);
let taskArray = growthActivity.findTaskByType(taskType); let taskArray = growthActivity.findTaskByType(taskType);
@@ -500,7 +500,7 @@ export async function accomplishTask(roleId: string, taskType: TASK_TYPE, count:
} }
//今日挑战统计 //今日挑战统计
allActivity = await ActivityModel.findOpenActivityByType(ACTIVITY_TYPE.TASK_DAILY_CHALLENGES, new Date()); allActivity = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.TASK_DAILY_CHALLENGES, new Date());
for (let activity of allActivity) { for (let activity of allActivity) {
let growthActivity = new DailyChallengesData(activity); let growthActivity = new DailyChallengesData(activity);
let taskArray = growthActivity.findTaskByType(taskType, growthActivity.today()); let taskArray = growthActivity.findTaskByType(taskType, growthActivity.today());
@@ -531,7 +531,7 @@ export async function accomplishTask(roleId: string, taskType: TASK_TYPE, count:
taskType === TASK_TYPE.EQUIP_QUALITY taskType === TASK_TYPE.EQUIP_QUALITY
) { ) {
allActivity = await ActivityModel.findOpenActivityByType(ACTIVITY_TYPE.THIRTY_DAYS, new Date()); allActivity = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.THIRTY_DAYS, new Date());
for (let activity of allActivity) { for (let activity of allActivity) {
let thirtyDaysActivity = new ThirtyDaysData(activity); let thirtyDaysActivity = new ThirtyDaysData(activity);
let playerRecords: ActivityThirtyDaysModelType[] = await ActivityThirtyDaysModel.findData(activity.serverId, activity.activityId, roleId); let playerRecords: ActivityThirtyDaysModelType[] = await ActivityThirtyDaysModel.findData(activity.serverId, activity.activityId, roleId);