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-04-06 12:39:54 +08:00
parent 4397b03bdf
commit 126c51b4dd
9 changed files with 18 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,7 +130,6 @@ export class FriendHandler {
// 申请
public async applyFriend(msg: { roleIds: string[] }, session: BackendSession) {
let roleId: string = session.get('roleId');
let roleIds = msg.roleIds;

3
game-server/app/servers/role/handler/taskHandler.ts
View File

@@ -221,6 +221,7 @@ export class ShopHandler {
async debugCompleteRandTask(msg: { type: number }, session: BackendSession) {
const roleId: string = session.get('roleId');
const sid: string = session.get('sid');
const serverId: number = session.get('serverId');
const { type } = msg
let tasks: (DicMainTask | DicDailyTask | DicAchievement)[] = [];
@@ -228,7 +229,7 @@ export class ShopHandler {
tasks.push(task);
}
let task = getRandSingleEelm(tasks);
// await checkTask(roleId, sid, task.taskType, task.condition, false, { isDebug: true });
await checkTask(serverId, roleId, sid, task.taskType, { debugInfo: {condition: task.condition} });
return resResult(STATUS.SUCCESS, {
task
});

8
game-server/app/services/chatService.ts
View File

@@ -251,7 +251,7 @@ function createChatRec(sender: boolean, curTime: Date, targetRoleId) {
* @param {Date} curTime
*/
async function updateRecentChats(sender: boolean, roleId: string, targetRoleId: string, curTime: Date) {
const chatInfo = await ChatInfoModel.findInfo(roleId);
const chatInfo = await roleChatInfos(roleId);
let recentPrivateChats: PrivateChatRec[] = chatInfo?.recentPrivateChats||[]
const recIdx = recentPrivateChats.findIndex(chat => { return chat.targetRoleId === targetRoleId });
if (recIdx === -1) {
@@ -269,7 +269,11 @@ async function updateRecentChats(sender: boolean, roleId: string, targetRoleId:
/**
* @description 获取聊天信息
*/
export async function roleChatInfos(roleId: string, roleName: string) {
export async function roleChatInfos(roleId: string, roleName?: string) {
if(!roleName) {
let role = await RoleModel.findByRoleId(roleId, 'roleName');
roleName = role.roleName;
}
let result = await ChatInfoModel.findInfo(roleId);
if (!result) {
result = await ChatInfoModel.createInfo({ roleId, roleName });

6
game-server/app/services/task/taskObj.ts
View File

@@ -23,6 +23,7 @@ import { resResult } from "../../pubUtils/util";
import { getActivities, getActivitiesByType, getActivityByServerId } from "../activity/activityService";
import { getRoleCreateTime, getRoleOnlineInfo, getServerCreateTime } from "../redisService";
import { getEquipById, getJewelByEquip, isRandSeUnLock } from "../equipService";
import { debug } from "console";
export class CheckTask {
serverId: number; // 区id
@@ -339,6 +340,11 @@ export class CheckSingleTask {
public async checkIsMatch(dicTaskParam: number[], getRecord: () => Promise<string[]>) {
let param = this.param;
let result: UpdateTaskParam = null;
if(this.param.debugInfo) {
return { set: this.param.debugInfo.condition }
}
switch(this.taskType) {
case TASK_TYPE.LOGIN_SUM: // 1. 累计登录 x 天
{

2
game-server/test/chat.test.ts
View File

@@ -370,10 +370,12 @@ describe('聊天测试', function () {
it('更新私聊阅读时间', function (done) {
pinusClient.request('chat.chatHandler.sendPrivateMessage', sendPrivateMessageParm(roleInfoT, TEXT_MSG), (res) => {
console.log('###', roleInfo.roleId)
checkSuccessResponse(res);
expect(res.data.content).to.equal(TEXT_MSG.content);
});
setTimeout(() => {
console.log('###', roleInfo.roleId)
pinusClientT.request('chat.chatHandler.readPrivateMessage', { targetRoleId: roleInfo.roleId }, (res) => {
checkSuccessResponse(res);
expect(res.data).to.be.an('object');

1
game-server/test/comBattle.test.ts
View File

@@ -230,7 +230,6 @@ describe('寻宝创建队伍', function() {
checkSuccessResponse(res);
expect(res.data.teamInfos).to.be.an('array');
res.data.teamInfos.forEach(info => {
console.log('####',info )
expect(info).to.have.contains.keys('teamCode', 'roleIds', 'pub', 'blueprtId', 'lv', 'status', 'roleStatus', 'capId', 'ceLimit', 'roleCnt', 'bossHpArr', 'createdAt');
});
done();

1
game-server/test/friend.test.ts
View File

@@ -93,6 +93,7 @@ describe('好友测试测试', function() {
});
it('申请好友', function(done) {
console.log('#####', roleInfoT.roleId)
pinusClient.request('role.friendHandler.applyFriend', { roleIds: [roleInfoT.roleId] } , (res) => {
checkSuccessResponse(res);
expect(res.data.isSuccess).to.be.a('boolean');

30
game-server/test/guildactivity.test.ts
View File

@@ -45,7 +45,6 @@ describe('蛮夷入侵测试', function () {
expect(res.data.time).to.be.a('number');
expect(res.data.challengeCnt).to.be.a('number');
challengeCnt = res.data.challengeCnt;
expect(res.data.gateHp).to.be.a('number');
checkGuildRanks(res.data.guildRank, aid);
checkGuildRank(res.data.myGuildRank, aid);
checkMemberRanks(res.data.memberRank);
@@ -55,7 +54,6 @@ describe('蛮夷入侵测试', function () {
});
let code;
let gateHp;
it('开启挑战', function (done) {
if(challengeCnt <= 0) {
@@ -75,12 +73,9 @@ describe('蛮夷入侵测试', function () {
expect(res.data.status).to.equal(1);
expect(res.data.guildScore).to.be.a('number');
expect(res.data.myScore).to.be.a('number');
expect(res.data.gateHp).to.be.a('number');
gateHp = res.data.gateHp;
expect(res.data.time).to.be.a('number');
expect(res.data.challengeCnt).to.equal(challengeCnt - 1);
challengeCnt = res.data.challengeCnt;
expect(res.data.medianCe).to.be.a('number').not.equal(0);
done();
});
}
@@ -99,34 +94,12 @@ describe('蛮夷入侵测试', function () {
expect(res.data.status).to.equal(1);
expect(res.data.guildScore).to.be.a('number');
expect(res.data.myScore).to.be.a('number');
expect(res.data.gateHp).to.be.a('number');
gateHp = res.data.gateHp;
expect(res.data.time).to.be.a('number');
done();
});
});
it('敌军攻打城门', function (done) {
let dataId = getRandSingleEelm(dic7001.filter(cur => cur.dataId))?.dataId;
checkGateHpUpdate(pinusClient, gateHp, newGateHp => {
gateHp = newGateHp;
done();
});
pinusClient.request('guild.gateActivityHandler.hitGate', { code, damage: 100, dataId, round: 1 }, res => {
checkSuccessResponse(res);
expect(res.data.code).to.equal(code);
expect(res.data.status).to.equal(1);
expect(res.data.guildScore).to.be.a('number');
expect(res.data.myScore).to.be.a('number');
expect(res.data.gateHp).to.be.a('number');
gateHp = res.data.gateHp;
expect(res.data.time).to.be.a('number');
});
});
it('结束挑战', function (done) {
pinusClient.request('guild.gateActivityHandler.battleEnd', { code, isSuccess: true }, res => {
checkSuccessResponse(res);
@@ -134,8 +107,6 @@ describe('蛮夷入侵测试', function () {
expect(res.data.status).to.equal(1);
expect(res.data.guildScore).to.be.a('number');
expect(res.data.myScore).to.be.a('number');
expect(res.data.gateHp).to.be.a('number');
gateHp = res.data.gateHp;
expect(res.data.time).to.be.a('number');
expect(res.data.info).to.be.an('object');
expect(res.data.info.round).to.be.a('number');
@@ -263,7 +234,6 @@ describe('诸侯混战测试', function () {
expect(res.data.gateHp).to.be.a('number');
expect(res.data.guildScore).to.be.a('number');
expect(res.data.myScore).to.be.a('number');
expect(res.data.medianCe).to.be.a('number');
done()
});
});

1
shared/domain/roleField/task.ts
View File

@@ -51,6 +51,7 @@ export class TaskParamInter {
newEquip?: EPlace; // 新装备栏（一个）
jewels?: JewelType[]; // 天晶石
debugInfo?: {condition: number};
};
export class TaskParam extends TaskParamInter {