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

Merge branch 'version/v0.1' of gitlab.trgame.cn:zyztech/zyz_server

Browse Source 
# Conflicts:
#	shared/resource/jsons/dic_api.json
This commit is contained in:
luying
2022-01-19 13:46:57 +08:00
parent 0f0e47d2b6 6191cad6c7
commit 47c64ca2c4
27 changed files with 86 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/services/actionPointService.ts
+1 -1
View File
@@ -69,7 +69,7 @@ function getApWithDataAp(roleId: string, ip: string, lv: number, dataAp: ActionP
* @param sid
*/
export async function setAp(roleId: string, ip: string, lv: number, changeAp: number, sid: string, reason: ITEM_CHANGE_REASON) {
console.log('***** setAp', roleId, ip, lv, changeAp)
// console.log('***** setAp', roleId, ip, lv, changeAp)
const now = Date.now();
const dicAp = getDicApByLv(lv);
let ApResult = await getAp(roleId, ip, lv, true);
game-server/app/services/activity/activityService.ts
+10 -5
View File
@@ -252,12 +252,17 @@ export function _getActivitiesByType(serverId: number, type: number) {
}
export function _getActivities() {
let activities = pinus.app.get('activities');
let result: ActivityInRemote[] = [];
for(let [_, activity] of activities) {
result.push(activity);
try {
let activities = pinus.app.get('activities');
// console.log('***** activities', activities);
let result: ActivityInRemote[] = [];
for(let [_, activity] of activities) {
result.push(activity);
}
return result;
} catch(e) {
console.log('******** activity e', e)
}
return result;
}
game-server/app/services/comBattleService.ts
+1 -1
View File
@@ -41,7 +41,7 @@ export function getRandBlueprtId(qualityArr: number[], lvRange: number, cnt = 1)
if (blueprtIdArr.length === 0) return null;
const res = getRandEelm(blueprtIdArr, cnt);
console.log('******** getRandBlueprtId', blueprtIdArr, cnt, res)
// console.log('******** getRandBlueprtId', blueprtIdArr, cnt, res)
return res;
}
game-server/app/services/eventSercive.ts
+1 -1
View File
@@ -281,7 +281,7 @@ function pushEventMsg(sid: string, roleId: string, msg: any ) {
* @param status 状态id
*/
export function checkEventStatus(type: number, status: number) {
console.log('type = '+ type + ' status = '+status);
// console.log('type = '+ type + ' status = '+status);
let flag: boolean; // 检查状态是否正确
if(type == EVENT_TYPE.BATTLE||type ==EVENT_TYPE.QUIZ) {
if(status == EVENT_RECORD_STATUS.BATTLE_SUCCESS) {
game-server/app/services/guildActivityService.ts
+8 -8
View File
@@ -104,7 +104,7 @@ export function getAllGuildActivityStatus() {
export function getGuildActivityByDic(dicGuildActivity: DicGuildActivity) {
let t = getTimeFun();
console.log('*********', dicGuildActivity.startTime, dicGuildActivity.startMinute, dicGuildActivity.startSeconds)
// console.log('*********', dicGuildActivity.startTime, dicGuildActivity.startMinute, dicGuildActivity.startSeconds)
let startTime = <number>t.getTimeWithHour(dicGuildActivity.startTime, dicGuildActivity.startMinute, dicGuildActivity.startSeconds);
let countdownTime = <number>t.getTimeWithHour(dicGuildActivity.countDown);
let { duringTime, openDay } = dicGuildActivity;
@@ -305,7 +305,7 @@ export async function sendGuildActEndMsg(aid: number) {
let guilds = obj.getGuilds();
console.log('******** guilds', guilds);
for (let [serverId, guildCodes] of guilds) {
console.log('***** serverId', serverId, 'guildCodes', guildCodes);
// console.log('***** serverId', serverId, 'guildCodes', guildCodes);
for (let guildCode of guildCodes) {
await gateActivitySettleReward(guildCode, serverId);
}
@@ -387,15 +387,15 @@ export async function gateActivitySettleReward(guildCode: string, serverId: numb
console.log('gateActivitySettleReward', guildCode, serverId);
let obj = getGateActivityObj();
let { gateHp, members } = obj.getObj(guildCode, serverId);
console.log('***** gateHp', gateHp, 'members', members);
// console.log('***** gateHp', gateHp, 'members', members);
let r = new Rank(REDIS_KEY.GATE_ACTIVITY, { serverId }, true);
let rank = await r.getMyRank({ guildCode });
let guildScore = await r.getMyScore({ guildCode });
console.log('****** ranks', rank, 'guildScore', guildScore);
// console.log('****** ranks', rank, 'guildScore', guildScore);
let rewards = getGuildAuctionRewards(GUILD_ACTIVITY_TYPE.GATE_ACTIVITY, rank);
console.log('***** rewards', JSON.stringify(rewards));
// console.log('***** rewards', JSON.stringify(rewards));
let rec = await GuildActivityRecordModel.updateInfo(guildCode, GUILD_ACTIVITY_TYPE.GATE_ACTIVITY, {
isSuccess: gateHp > 0,
@@ -762,14 +762,14 @@ export async function setDicGuildActivity(now: number, aid: number, startSeconds
export async function setDicAuctionTime(startTime: number, endActivity: number, startGuild: number, endGuild: number, startWorld: number, endWorld: number) {
console.log('********* setDicAuctionTime', startTime, endActivity, startGuild, endGuild, startWorld, endWorld);
// console.log('********* setDicAuctionTime', startTime, endActivity, startGuild, endGuild, startWorld, endWorld);
let startGuildDate = new Date(startTime + endActivity * 1000 + startGuild * 1000);
let endGuildDate = new Date(startGuildDate.getTime() + endGuild * 1000);
let startWorldDate = new Date(endGuildDate.getTime() + startWorld * 1000);
let endWorldDate = new Date(startWorldDate.getTime() + endWorld * 1000);
console.log('********* setDicAuctionTime', startGuildDate, endGuildDate, startWorldDate, endWorldDate);
// console.log('********* setDicAuctionTime', startGuildDate, endGuildDate, startWorldDate, endWorldDate);
gameData.auctionTime.set(AUCTION_TIME.GUILD_PREVIEW, formatTime(new Date(startTime)));
gameData.auctionTime.set(AUCTION_TIME.GUILD_OPEN, formatTime(startGuildDate));
@@ -778,7 +778,7 @@ export async function setDicAuctionTime(startTime: number, endActivity: number,
gameData.auctionTime.set(AUCTION_TIME.WORLD_OPEN, formatTime(startWorldDate));
gameData.auctionTime.set(AUCTION_TIME.WORLD_CLOSE, formatTime(endWorldDate));
console.log('*********** setDicAuctionTime', gameData.auctionTime)
// console.log('*********** setDicAuctionTime', gameData.auctionTime)
}
function formatTime(date: Date) {
game-server/app/services/guildService.ts
+1 -1
View File
@@ -54,7 +54,7 @@ export async function checkAuth(func: number, targetCode: string, guildAuth: num
guildAuth = GUILD_AUTH.OTHERS;
}
const dicGuildAuth = gameData.guildAuth.get(func);
console.log('*checkAuth*', func, guildAuth, dicGuildAuth)
// console.log('*checkAuth*', func, guildAuth, dicGuildAuth)
if (!dicGuildAuth) return false;
return dicGuildAuth.includes(guildAuth);
game-server/app/services/pvpService.ts
+1 -1
View File
@@ -528,7 +528,7 @@ export async function generPVPOppRecInfo(isSuccess: boolean, curOpp: OppPlayer,
let resultMaxRank = gameData.pvpRankMax.max;//根据排行榜的奖励表，获得最大排名挡位的最小值，其余不在结算中结算的玩家按照最大排名挡位在登录或进入pvp时结算
let r = new Rank(REDIS_KEY.PVP_RANK, { seasonNum: pvpConfig.seasonNum }, false, resultMaxRank.min - 1);
let allRank = <RoleRankInfo[]>(await r.getRankByRange());
console.log('******** allRank', 0, resultMaxRank.min - 2, allRank)
// console.log('******** allRank', 0, resultMaxRank.min - 2, allRank)
for(let { rank, roleId } of allRank) {
console.log('******** pvpSeasonEnd: ', rank, roleId);
let pvpDefense = await PvpDefenseModel.findByRoleId(roleId);
game-server/app/services/taskService.ts
+2 -2
View File
@@ -81,7 +81,7 @@ export async function checkActivityTask(serverId: number, sid: string, roleId: s
}
export async function pushActivityUpdate(roleId: string, sid: string, pushMessage: any[]) {
console.log('pushActivityUpdate', JSON.stringify(pushMessage))
// console.log('pushActivityUpdate', JSON.stringify(pushMessage))
if (pushMessage.length > 0) {
if (!sid) {
let onlineUser = await getRoleOnlineInfo(roleId);
@@ -161,7 +161,7 @@ export async function checkTaskInBattleSweep(serverId: number, roleId: string, s
}
export async function checkTaskInComBattleEnd(roleStatus: RoleStatus[], capId: string, quality: number) {
console.log('********', JSON.stringify(roleStatus), capId, quality)
// console.log('********', JSON.stringify(roleStatus), capId, quality)
for (let { roleId, isRobot } of roleStatus) {
if (!isRobot) {
game-server/app/services/timeTaskService.ts
+6 -4
View File
@@ -31,6 +31,7 @@ import { getWorldChannelSid } from './chatService';
import { createMarqueeMsg, pushMarqueeMsg } from './sysChatService';
import { RegionModel, RegionType } from '../db/Region';
import { CreateServerParam } from '../domain/backEndField/params';
import { infologger } from '../util/logger';
const PER_SECOND = 1 * 1000;
const PER_DAY = 24 * 60 * 60;
@@ -193,6 +194,7 @@ export async function resetPvpSeasonTime(minute: number) {
export async function reportOnlineSchedule() {
let allRoles = await getAllOnlineRoles();
infologger.info('reportOnlineSchedule all roles count: ', allRoles.length);
console.log('reportOnlineSchedule all roles count: ', allRoles.length)
for (let { roleId, userCode, sid } of allRoles) {
let result = reportOneOnline(roleId, userCode, sid, false);
@@ -364,9 +366,9 @@ export function auctionSchedule() {
let worldOpen = gameData.auctionTime.get(AUCTION_TIME.WORLD_OPEN);
let worldClose = gameData.auctionTime.get(AUCTION_TIME.WORLD_CLOSE);
console.log('***** auctionSchedule', guildOpen.hour, guildOpen.minute, guildOpen.seconds);
console.log('***** auctionSchedule', worldOpen.hour, worldOpen.minute, worldOpen.seconds);
console.log('***** auctionSchedule', worldClose.hour, worldClose.minute, worldClose.seconds);
// console.log('***** auctionSchedule', guildOpen.hour, guildOpen.minute, guildOpen.seconds);
// console.log('***** auctionSchedule', worldOpen.hour, worldOpen.minute, worldOpen.seconds);
// console.log('***** auctionSchedule', worldClose.hour, worldClose.minute, worldClose.seconds);
startGuildAuctionJobId = scheduleJob('startGuildAuction', `${guildOpen.seconds} ${guildOpen.minute} ${guildOpen.hour} * * ?`, startGuildAuction);
startWorldAuctionJobId = scheduleJob('startWorldAuction', `${worldOpen.seconds} ${worldOpen.minute} ${worldOpen.hour} * * ?`, startWorldAuction);
stopAuctionJobId = scheduleJob('stopAuction', `${worldClose.seconds} ${worldClose.minute} ${worldClose.hour} * * ?`, stopAuction);
@@ -446,8 +448,8 @@ async function setMaintenance(batchCode: string) {
if(now > maintenance.startTime - 5 * 60) {
maintenanceNotifySchedule(batchCode);
} else {
if(scheduledJobs[`maintenNotify${batchCode}`]) scheduledJobs[`maintenNotify${batchCode}`].cancel();
scheduleJob(`maintenNotify${batchCode}`, (maintenance.startTime - 5 * 60) * 1000, () => {
console.log('******* 通知')
maintenanceNotifySchedule(batchCode);
})
}