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

镇念塔：一键跳关

Browse Source
This commit is contained in:
luying
2022-03-10 17:02:46 +08:00
parent 053e603301
commit 3d0f6ef5b3
11 changed files with 6160 additions and 3035 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/services/activity/activityService.ts
+2 -1
View File
@@ -38,6 +38,7 @@ import { ActivityTaskPointModel } from '../../db/ActivityTaskPoint';
import { getRoleOnlineInfo } from '../redisService';
import { addTaskPassPoint } from './taskPassService';
import { getGuildChannelSid } from '../chatService';
import { getGuildPayDataShow } from './guildPayService';
/**
* 获取活动数据
@@ -203,7 +204,7 @@ export async function getActivity(serverId: number, roleId: string, guildCode: s
}
case ACTIVITY_TYPE.GUILD_PAY:
{
activityData = await getGuildPayDataShow(serverId, activityId, roleId, guildCode);
}
default: {
console.log('未知活动类型.........', activityType)
game-server/app/services/activity/monthlyTicketService.ts
+7
View File
@@ -214,4 +214,11 @@ export function getVipRegretCnt(vipStartTime: number) {
count = VIP.VIP_REGRET_CNT_WITH_VIP;
}
return count;
}
export function vipCanSkipTower(recommendCeSum: number, heroesCeSum: number, vipStartTime: number) {
console.log('####', recommendCeSum, heroesCeSum, vipStartTime, );
let ratio = vipStartTime > 0? VIP.VIP_TOWER_SKIP_CE_RATIO_WITH_VIP: VIP.VIP_TOWER_SKIP_CE_RATIO_WITHOUT_VIP;
console.log('#####', VIP.VIP_TOWER_SKIP_CE_RATIO_WITH_VIP, VIP.VIP_TOWER_SKIP_CE_RATIO_WITHOUT_VIP, ratio)
return heroesCeSum > recommendCeSum * ratio;
}
game-server/app/services/battleService.ts
+55 -26
View File
@@ -29,6 +29,20 @@ export async function getTowerStatus(role: RoleType) {
let role = await RoleModel.towerLvUp(roleId);
towerLv = role.towerLv;
}
let towerRec = await getTowerRecByLv(roleId, towerLv);
return {
canHungUp: canHunUp(towerLv),
canSendTask: towerLv - 1 >= dicParam.TOWER_SEARCH.TOWER_SEARCH_STARTLIMITED,
sendTaskEnableLv: dicParam.TOWER_SEARCH.TOWER_SEARCH_STARTLIMITED,
curLv: towerLv,
usedHeroes: towerRec.heroes,
progress: towerRec.warStatus
};
}
export async function getTowerRecByLv(roleId: string, towerLv: number) {
let towerRec = await TowerRecordModel.getRecordByLv(roleId, towerLv);
if (!towerRec) {
const towerInfo = gameData.tower.get(towerLv);
@@ -39,15 +53,7 @@ export async function getTowerStatus(role: RoleType) {
towerRec = await TowerRecordModel.createRecord({roleId, lv: towerLv, warStatus: sts});
// return { code: 201, data: '天梯记录异常' };
}
return {
canHungUp: towerLv - 1 >= dicParam.TOWER_HANG_UP.TOWER_HANG_UP_ENABLE_LV,
hungUpEnableLv: dicParam.TOWER_HANG_UP.TOWER_HANG_UP_ENABLE_LV,
canSendTask: towerLv - 1 >= dicParam.TOWER_SEARCH.TOWER_SEARCH_STARTLIMITED,
sendTaskEnableLv: dicParam.TOWER_SEARCH.TOWER_SEARCH_STARTLIMITED,
curLv: towerLv,
usedHeroes: towerRec.heroes,
progress: towerRec.warStatus
};
return towerRec;
}
/**
@@ -175,7 +181,7 @@ export async function checkTowerWar(roleId: string, battleId: number, seqIds: nu
};
}
function checkForbiddenChar(hid: number, fobiddenCharactor: {type: number, id: number}[]) {
export function checkForbiddenChar(hid: number, fobiddenCharactor: {type: number, id: number}[]) {
let dicHero = gameData.hero.get(hid);
let dicJob = gameData.job.get(dicHero.jobid);
let flag = false;
@@ -226,21 +232,10 @@ export async function towerBattleEnd(sid: string, roleId: string, serverId: numb
let r = new Rank(REDIS_KEY.TOWER_RANK, { serverId });
await r.setRankWithRoleInfo(roleId, role.towerLv - 1, role.towerUpTime.getTime(), role);
const nextTowerInfo = gameData.tower.get(role.towerLv);
if (nextTowerInfo) {
const { warArray } = nextTowerInfo;
const sts = warArray.map(id => {
return { warId: id, status: false };
});
await TowerRecordModel.createRecord({ roleId, lv: role.towerLv, warStatus: sts });
}
await createNewTowerRecord(roleId, role.towerLv);
const { reward } = gameData.tower.get(role.towerLv - 1);
if (reward) towerReward = reward;
if (role.towerLv == dicParam.TOWER_HANG_UP.TOWER_HANG_UP_ENABLE_LV + 1) {
await startHangUp(roleId, roleName);
}
await checkAndStartHungUp(roleId, roleName, role.towerLv - 1);
// 任务
await checkTask(roleId, sid, TASK_TYPE.BATTLE_TOWER_LV, role.towerLv - 1, false, {});
await checkActivityTask(serverId, sid, roleId, TASK_TYPE.BATTLE_TOWER_LV, 1, { towerLv: role.towerLv - 1 });
@@ -256,13 +251,47 @@ export async function towerBattleEnd(sid: string, roleId: string, serverId: numb
}
}
async function startHangUp(roleId: string, roleName: string) {
await HangUpRecordModel.initRecord(roleId, roleName);
/**
* 创建下一层记录
* @param roleId
* @param nextTowerLv 下一层塔
*/
export async function createNewTowerRecord(roleId: string, nextTowerLv: number) {
const nextTowerInfo = gameData.tower.get(nextTowerLv);
if (nextTowerInfo) {
const { warArray } = nextTowerInfo;
const sts = warArray.map(id => {
return { warId: id, status: false };
});
await TowerRecordModel.createRecord({ roleId, lv: nextTowerLv, warStatus: sts });
}
}
/**
* 当可以挂机的时候开始挂机
* @param roleId
* @param roleName
* @param towerLv 当前楼层，升过级之后的层
*/
export async function checkAndStartHungUp(roleId: string, roleName: string, towerLv: number) {
if (towerLv - 1 == dicParam.TOWER_HANG_UP.TOWER_HANG_UP_ENABLE_LV) {
await HangUpRecordModel.initRecord(roleId, roleName, towerLv);
}
}
/**
* 是否可以挂机，如果是10，那么要打过10层，即11层时可以开始挂机
* @param towerLv
* @returns
*/
export function canHunUp(towerLv: number) {
return towerLv - 1 >= dicParam.TOWER_HANG_UP.TOWER_HANG_UP_ENABLE_LV
}
export async function calcuHangUpReward(role: RoleType, speedUp = false, speedUpCnt = 1, curTime = new Date()) {
let { roleId, towerLv = 1, hangUpSpdUpCnt = 0, lastSpdUpTime, vipStartTime } = role;
if (towerLv - 1 < dicParam.TOWER_HANG_UP.TOWER_HANG_UP_ENABLE_LV) {
if (!canHunUp(towerLv)) {
return false
}