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

测试：修改测试bug

Browse Source
This commit is contained in:
qiaoxin
2021-07-08 21:20:19 +08:00
parent 9d52053ba0
commit 876b0ee600
8 changed files with 401 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/battle/handler/guildHandler.ts
+207 -152
View File
@@ -15,9 +15,9 @@ import { UserGuildApplyModel } from '../../../db/UserGuildApply';
import { hasStructureConsume, getStructureConsume, gameData } from '../../../pubUtils/data';
import { GuildRecModel } from '../../../db/GuildRec';
import { sendMailByContent, SendMailFun } from '../../../services/mailService';
import { updateUserInfo, isRoleOnline, getRoleOnlineInfo } from '../../../services/redisService';
import { updateUserInfo, isRoleOnline, getRoleOnlineInfo } from '../../../services/redisService';
import { openGuildRefine } from '../../../services/guildRefineService';
import { openGuildRefine } from '../../../services/guildRefineService';
import { unlockTrain } from '../../../services/guildTrainService';
import { removeBossRank } from '../../../services/guildBossService';
import { removeTrainRank } from '../../../services/guildTrainService';
@@ -45,15 +45,15 @@ export class GuildHandler {
// 检查权限是否够，包括是否参过团
const checkResult = await checkAuth(GUILD_OPERATE.CREATE_GUILD, roleId);
if(!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
if (!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
// 检查名字是否重
const checkNameResult = await GuildModel.checkName(name, serverId);
if(checkNameResult) return resResult(STATUS.GUILD_NAME_DUP);
if (checkNameResult) return resResult(STATUS.GUILD_NAME_DUP);
// 检查元宝是否够
const role = await RoleModel.findByRoleId(roleId);
if(ARMY.ARMY_CREAT_COST > role.gold) {
if (ARMY.ARMY_CREAT_COST > role.gold) {
return resResult(STATUS.DAILY_REFRESH_GOLD_LACK);
}
@@ -61,28 +61,28 @@ export class GuildHandler {
// 创建公会
const guild = await GuildModel.createGuild({ name, icon, notice }, role, serverId);
if(!guild) return resResult(STATUS.GUILD_CREATE_ERROR);
if (!guild) return resResult(STATUS.GUILD_CREATE_ERROR);
guild.leader = <RoleType>guild.leader;
//创建科技树
await openGuildRefine(guild.code);
await unlockTrain(guild.code, 1);
const userGuild = await UserGuildModel.createUserGuild(guild.code, role, true);
if(!userGuild) return resResult(STATUS.GUILD_CREATE_ERROR);
if (!userGuild) return resResult(STATUS.GUILD_CREATE_ERROR);
await RoleModel.joinGuild(roleId, guild.code, guild.name);
await UserGuildApplyModel.deleteApply(roleId); // 删除玩家所有对其他公会的申请
// 加入排行
let r = new Rank(REDIS_KEY.GUILD_ACTIVE_RANK, {serverId});
let r = new Rank(REDIS_KEY.GUILD_ACTIVE_RANK, { serverId });
await r.setRankWithGuildInfo(guild.code, 0, Date.now(), guild);
let r2 = new Rank(REDIS_KEY.GUILD_LV_RANK, {serverId});
let r2 = new Rank(REDIS_KEY.GUILD_LV_RANK, { serverId });
await r2.setRankWithGuildInfo(guild.code, 0, Date.now(), guild);
let rank = await r.getMyRank({ guildCode: guild.code });
// 加入channel
session.set('guildCode', guild.code);
session.push('guildCode', () => {});
session.push('guildCode', () => { });
addRoleToGuildChannel(roleId, sid, guild.code);
// 添加动态
@@ -91,28 +91,28 @@ export class GuildHandler {
this.app.rpc.chat.guildRemote.addRec.toServer(chatSid, rec);
// 返回
const result = { ...guild, rank, myInfo: { ...userGuild, isOnline: true}};
const result = { ...guild, rank, myInfo: { ...userGuild, isOnline: true } };
return resResult(STATUS.SUCCESS, result);
}
// 获取军团列表
async getGuildList(msg: { page: number, showPeopleMax: boolean, name: string }, session: BackendSession) {
const roleId = session.get('roleId');
// const sid = session.get('sid');
const serverId = session.get('serverId');
const { page = 1, showPeopleMax, name } = msg;
const checkResult = await checkAuth(GUILD_OPERATE.GET_GUILD_LIST, roleId);
if(!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
if (!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
const guildList = await GuildModel.findByCondition(page, showPeopleMax, name, serverId);
const applyList = await UserGuildApplyModel.findApplyByRole(roleId);
const { quitGuildTime: quitTime = 0 } = await RoleModel.findByRoleId(roleId);
const list = new Array<GuildListInfo>();
for(let guild of guildList) {
const list = new Array<GuildListInfo>();
for (let guild of guildList) {
let info = new GuildListInfo(guild);
let hasApply = applyList.find(cur => cur.guildCode == guild.code);
@@ -128,10 +128,10 @@ export class GuildHandler {
const roleId = session.get('roleId');
const roleName = session.get('roleName');
const { code, name, notice, introduce, ceLimit, isAuto } = msg;
if(!name) return resResult(STATUS.WRONG_PARMS);
if (!name) return resResult(STATUS.WRONG_PARMS);
const checkResult = await checkAuth(GUILD_OPERATE.SET_INFO, roleId, code);
if(!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
if (!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
const select = ['code', 'name', 'notice', 'introduce', 'ceLimit', 'isAuto', 'icon'];
const guild = await GuildModel.updateInfo(code, { name, notice, introduce, ceLimit, isAuto }, {}, select.join(' '));
@@ -145,7 +145,7 @@ export class GuildHandler {
// 返回
return resResult(STATUS.SUCCESS, { ...guild });
}
// 游客查看军团详细信息
async getGuildInfo(msg: { code: string }, session: BackendSession) {
@@ -154,7 +154,7 @@ export class GuildHandler {
const { code } = msg;
const checkResult = await checkAuth(GUILD_OPERATE.GET_GUILD_INFO, roleId, code);
if(!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
if (!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
const select = ['code', 'name', 'notice', 'ceLimit', 'isAuto', 'icon', 'lv', 'memberCnt', 'guildCe'];
const guild = await GuildModel.findByCode(code, serverId, select.join(' '));
@@ -162,7 +162,7 @@ export class GuildHandler {
delete guild.leader;
// 返回
return resResult(STATUS.SUCCESS, { ...guild, leader: leader.roleName });
}
// 团长授权头衔
@@ -177,96 +177,96 @@ export class GuildHandler {
const hisUserGuild = await UserGuildModel.getMyGuild(memberRoleId, 'auth guildCode job');
const checkMyResult = await checkAuth(GUILD_OPERATE.SET_AUTH, roleId, null, myUserGuild);
if(!checkMyResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
if (!checkMyResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
const checkResult = await checkAuth(GUILD_OPERATE.BE_SET_AUTH, memberRoleId, myUserGuild.guildCode, hisUserGuild);
if(!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
if (!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
const { guildCode: code } = myUserGuild;
if(auth == hisUserGuild.auth) {
if (auth == hisUserGuild.auth) {
return resResult(STATUS.GUILD_AUTH_NOT_CHANGE);
}
// 管理员最大数 等策划表
let guild = await GuildModel.findByCode(code, serverId, 'managerCnt lv');
if(!guild) {
if (!guild) {
return resResult(STATUS.GUILD_NOT_FOUND);
}
let managerCntInc = 0;
if(auth == GUILD_AUTH.LEADER) { // 转让团长
if(hisUserGuild.auth == GUILD_AUTH.MANAGER) {
if (auth == GUILD_AUTH.LEADER) { // 转让团长
if (hisUserGuild.auth == GUILD_AUTH.MANAGER) {
managerCntInc = -1;
}
} else {
managerCntInc = auth == GUILD_AUTH.MANAGER? 1: -1;
} else {
managerCntInc = auth == GUILD_AUTH.MANAGER ? 1 : -1;
}
let maxManagerCnt = gameData.centerBase.get(guild.lv);
if(!maxManagerCnt) return STATUS.DIC_DATA_NOT_FOUND;
if (!maxManagerCnt) return STATUS.DIC_DATA_NOT_FOUND;
if(guild.managerCnt + managerCntInc > maxManagerCnt.managerNum) {
if (guild.managerCnt + managerCntInc > maxManagerCnt.managerNum) {
return resResult(STATUS.GUILD_MANAGER_REACH_MAX);
}
const userGuild = await UserGuildModel.updateInfo(memberRoleId, { auth, job: auth == GUILD_AUTH.LEADER? GUILD_JOB.JIANGJUN: hisUserGuild.job }, {}, 'auth'); // 设置权限
if(!userGuild) {
const userGuild = await UserGuildModel.updateInfo(memberRoleId, { auth, job: auth == GUILD_AUTH.LEADER ? GUILD_JOB.JIANGJUN : hisUserGuild.job }, {}, 'auth'); // 设置权限
if (!userGuild) {
return resResult(STATUS.GUILD_MEMBER_NOT_FOUND);
}
const role = await RoleModel.findByRoleId(memberRoleId);
let updateObject = {};
if(auth == GUILD_AUTH.LEADER) { // 转让团长
if (auth == GUILD_AUTH.LEADER) { // 转让团长
updateObject['leader'] = role._id;
await UserGuildModel.updateInfo(roleId, { auth: GUILD_AUTH.MEMBER, job: GUILD_JOB.SHIBING }, {}); // 自己降权限
await updateUserInfo(REDIS_KEY.GUILD_INFO, code, [{field: 'leader', value: new GuildLeader(role) } ]);
await updateUserInfo(REDIS_KEY.GUILD_INFO, code, [{ field: 'leader', value: new GuildLeader(role) }]);
}
guild = await GuildModel.updateInfo(code, updateObject, { managerCnt: managerCntInc }, 'managerCnt code name'); // 如果有转让团长设置leader
let chatSid = await getGuildChannelSid(code);
// 添加动态
if(auth == GUILD_AUTH.MANAGER) {
if (auth == GUILD_AUTH.MANAGER) {
const rec = await GuildRecModel.createGuildRec(roleId, code, GUILD_REC_TYPE.SET_MANAGER, [role.roleName]);
this.app.rpc.chat.guildRemote.updateInfo.toServer(chatSid, code, { managerCnt: guild.managerCnt });
this.app.rpc.chat.guildRemote.addRec.toServer(chatSid, rec);
await sendMailByContent(MAIL_TYPE.GUILD_BE_SET_MANAGER, memberRoleId, { sendName: roleName, params: [guild.name] });
} else if (auth == GUILD_AUTH.LEADER) {
const rec = await GuildRecModel.createGuildRec(roleId, code, GUILD_REC_TYPE.SET_LEADER, [roleName, role.roleName]);
this.app.rpc.chat.guildRemote.changeLeader.toServer(chatSid, code, guild.managerCnt, role, roleId);
this.app.rpc.chat.guildRemote.addRec.toServer(chatSid, rec);
this.app.rpc.chat.guildRemote.changeLeader.toServer(chatSid, code, guild.managerCnt, role, roleId);
this.app.rpc.chat.guildRemote.addRec.toServer(chatSid, rec);
await sendMailByContent(MAIL_TYPE.GUILD_BE_SET_LEADER, memberRoleId, { sendName: roleName, params: [guild.name] });
} else {
this.app.rpc.chat.guildRemote.updateInfo.toServer(chatSid,code, { managerCnt: guild.managerCnt });
this.app.rpc.chat.guildRemote.updateInfo.toServer(chatSid, code, { managerCnt: guild.managerCnt });
await sendMailByContent(MAIL_TYPE.GUILD_BE_SET_MEMBER, memberRoleId, { sendName: roleName, params: [guild.name] });
}
// 返回
return resResult(STATUS.SUCCESS, {
return resResult(STATUS.SUCCESS, {
roleId: memberRoleId, auth: userGuild.auth, managerCnt: guild.managerCnt
});
});
}
// 团员获取自己军团详细信息
async getMyGuildInfo(msg: { }, session: BackendSession) {
async getMyGuildInfo(msg: {}, session: BackendSession) {
const roleId = session.get('roleId');
const serverId = session.get('serverId');
const sid = session.get('sid');
let userGuild = await getUserGuildWithRefActive(roleId, 'job auth guildCode receivedActive activeRecord activeDaily activeWeekly');
if(!userGuild) {
if (!userGuild) {
return resResult(STATUS.SUCCESS, { hasGuild: false })
};
const checkResult = await checkAuth(GUILD_OPERATE.GET_MY_GUILD_INFO, roleId, userGuild.guildCode, userGuild);
if(!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
if (!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
let guild = await getGuildWithRefActive(userGuild.guildCode, serverId);
if(!guild) {
if (!guild) {
return resResult(STATUS.GUILD_NOT_FOUND);
}
@@ -285,18 +285,18 @@ export class GuildHandler {
// 检查权限
const checkResult = await checkAuth(GUILD_OPERATE.APPLY_GUILD, roleId);
if(!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
if (!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
const guild = await GuildModel.findByCode(code, serverId);
if(!guild) return resResult(STATUS.GUILD_NOT_FOUND);
if (!guild) return resResult(STATUS.GUILD_NOT_FOUND);
const { isMemberMax, isAuto, ceLimit, lv } = guild;
if(isMemberMax) {
if (isMemberMax) {
return resResult(STATUS.GUILD_MEMBER_MAX);
}
const role = await RoleModel.findByRoleId(roleId, null, true);
if(ceLimit > role.ce) {
if (ceLimit > role.ce) {
return resResult(STATUS.GUILD_NOT_REACH_CONDI);
}
// TODO 暂时关闭
@@ -305,9 +305,9 @@ export class GuildHandler {
// }
let hasGuild = false;
if(isAuto) { // 自动加入
if (isAuto) { // 自动加入
const joinResult = await joinGuild(code, guild.name, lv, roleId, serverId, session);
if(joinResult.status == -1) {
if (joinResult.status == -1) {
return joinResult.resResult;
}
@@ -317,7 +317,7 @@ export class GuildHandler {
let chatSid = await getGuildChannelSid(code);
this.app.rpc.chat.guildRemote.updateInfo.toServer(chatSid, code, { memberCnt: joinResult.memberCnt, guildCe: joinResult.guildCe });
this.app.rpc.chat.guildRemote.addRec.toServer(chatSid,rec);
this.app.rpc.chat.guildRemote.addRec.toServer(chatSid, rec);
hasGuild = true;
} else { // 不自动加入，插入申请表
await UserGuildApplyModel.createUserGuildApply(role, guild, GUILD_APPLY_TYPE.APPLY);
@@ -329,17 +329,17 @@ export class GuildHandler {
// 玩家申请公会
async getApplyList(msg: { code: string, lastApplyCode: string }, session: BackendSession) {
const roleId = session.get('roleId');
const { code, lastApplyCode } = msg;
// 检查权限
const checkResult = await checkAuth(GUILD_OPERATE.GET_APPLY_LIST, roleId);
if(!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
if (!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
const result = await UserGuildApplyModel.findApplyByGuild(code, lastApplyCode);
const list = [];
for(let cur of result) {
for (let cur of result) {
let role = <RoleType>cur.role;
delete cur.role;
let isOnline = await isRoleOnline(role.roleId);
@@ -351,7 +351,7 @@ export class GuildHandler {
// 团长同意/拒绝公会申请
async receiveApply(msg: { code: string, applyCodeList: [string], isReceived: boolean }, session: BackendSession) {
const roleId = session.get('roleId');
const roleName = session.get('roleName');
const serverId = session.get('serverId');
@@ -359,28 +359,28 @@ export class GuildHandler {
// 检查权限
const checkResult = await checkAuth(GUILD_OPERATE.RECEIVE_APPLY, roleId, code);
if(!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
if (!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
const applyList = await UserGuildApplyModel.getListByApplyCode(applyCodeList);
const guild = await GuildModel.findByCode(code, serverId);
let roleIds = new Array<string>();
if(isReceived) { // 同意申请，加入
for(let { roleId } of applyList) {
if (isReceived) { // 同意申请，加入
for (let { roleId } of applyList) {
const joinResult = await joinGuild(code, guild.name, guild.lv, roleId, serverId, session);
if(joinResult.status == -1) continue;
if (joinResult.status == -1) continue;
let chatSid = await getGuildChannelSid(code);
// 更新人数增加
this.app.rpc.chat.guildRemote.updateInfo.toServer(chatSid, code, { memberCnt: joinResult.memberCnt, guildCe: joinResult.guildCe });
// 添加动态
const rec = await GuildRecModel.createGuildRec(roleId, code, GUILD_REC_TYPE.JOIN_GUILD, [joinResult.roleName]);
this.app.rpc.chat.guildRemote.addRec.toServer(chatSid,rec);
this.app.rpc.chat.guildRemote.addRec.toServer(chatSid, rec);
roleIds.push(roleId);
}
} else { // 拒绝申请，删除申请
for(let { roleId } of applyList) {
for (let { roleId } of applyList) {
await sendMailByContent(MAIL_TYPE.GUILD_APPLY_REFUSE, roleId, { sendName: roleName, params: [guild.name] });
}
@@ -391,37 +391,37 @@ export class GuildHandler {
}
// 团长查看（刷新）可邀请人列表
async getInviteMemberList(msg: { }, session: BackendSession) {
async getInviteMemberList(msg: {}, session: BackendSession) {
const roleId = session.get('roleId');
const serverId = session.get('serverId');
let myGuild = await UserGuildModel.getMyGuild(roleId, USER_GUILD_SELECT.ENTRY)
// 检查权限
const checkResult = await checkAuth(GUILD_OPERATE.GET_INIVATION_MEMBER_LIST, roleId, myGuild.guildCode, myGuild);
if(!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
if (!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
let guild = await GuildModel.findByCode(myGuild.guildCode, serverId, GUILD_SELECT.INVITED_MEMBER);
let invitedMembers = guild.invitedMembers;
if(shouldRefresh(guild.inviteTime, new Date())) {
if (shouldRefresh(guild.inviteTime, new Date())) {
invitedMembers = [];
}
// 离线时间，三天内在线且尚未加入军团。按以下规则排序 离线时间 玩家等级 玩家战力
const day = <number>getTimeFun().getBeforeDay(3);
const { quitGuildTime: quitTime = 0 } = await RoleModel.findByRoleId(roleId);
let allList = await RoleModel.getInviteList(day, serverId);
allList = allList.filter(cur => !invitedMembers.includes(cur.roleId))
let list = getRandEelm(allList, 10);
if(!list.length) list = allList;
if (!list.length) list = allList;
list = sortArrRandom(list);
let result = [];
for(let cur of list) {
for (let cur of list) {
let isOnline = await isRoleOnline(cur.roleId);
result.push({...cur, isOnline})
result.push({ ...cur, isOnline })
}
return resResult(STATUS.SUCCESS, { quitTime, list: result });
@@ -430,27 +430,27 @@ export class GuildHandler {
// 团长（一键）邀请人
async inviteMember(msg: { code: string, roleIds: string[] }, session: BackendSession) {
const roleId = session.get('roleId');
const serverId = session.get('serverId');
const { code, roleIds } = msg;
// 检查权限
const checkResult = await checkAuth(GUILD_OPERATE.INVATE_MEMBER, roleId, code);
if(!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
if (!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
const guild = await GuildModel.findByCode(code, serverId, GUILD_SELECT.INVITED_MEMBER);
if(guild.isMemberMax) return resResult(STATUS.GUILD_MEMBER_MAX);
if (guild.isMemberMax) return resResult(STATUS.GUILD_MEMBER_MAX);
const roleList = await RoleModel.findRoleByField('roleId', roleIds);
let result = new Array<string>();
let uids = [];
for(let role of roleList) {
if(!role.hasGuild) {
for (let role of roleList) {
if (!role.hasGuild) {
await UserGuildApplyModel.createUserGuildApply(role, guild, GUILD_APPLY_TYPE.INVITE);
result.push(role.roleId);
let hisInfo = await getRoleOnlineInfo(role.roleId);
if(hisInfo.isOnline) {
if (hisInfo.isOnline) {
uids.push({ uid: role.roleId, sid: hisInfo.sid })
}
}
@@ -464,13 +464,13 @@ export class GuildHandler {
// 成员收到邀请列表
async getInvitationList(msg: { lastApplyCode: string }, session: BackendSession) {
const roleId = session.get('roleId');
const { lastApplyCode } = msg;
// 检查权限
const checkResult = await checkAuth(GUILD_OPERATE.GET_INVITATION_LIST, roleId);
if(!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
if (!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
const result = await UserGuildApplyModel.findInviteByRole(roleId, lastApplyCode);
const list = result.map(cur => {
@@ -487,25 +487,25 @@ export class GuildHandler {
// 成员同意/拒绝邀请
async receiveInvitation(msg: { applyCode: string, isReceived: boolean }, session: BackendSession) {
const roleId = session.get('roleId');
const serverId = session.get('serverId');
const { applyCode, isReceived } = msg;
// 检查权限
const checkResult = await checkAuth(GUILD_OPERATE.RECEIVE_INVITAION, roleId);
if(!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
if (!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
const invite = await UserGuildApplyModel.findByCode(applyCode);
if(!invite) return resResult(STATUS.GUILD_INVITE_NOT_FOUND);
if (!invite) return resResult(STATUS.GUILD_INVITE_NOT_FOUND);
let code: string;
if(isReceived) { // 同意申请，加入
if (isReceived) { // 同意申请，加入
const { guildCode } = invite;
const guild = await GuildModel.findByCode(guildCode, serverId);
const joinResult = await joinGuild(guildCode, guild.name, guild.lv, roleId, serverId, session);
if(joinResult.status == -1) {
if (joinResult.status == -1) {
return joinResult.resResult;
}
@@ -525,23 +525,23 @@ export class GuildHandler {
// 获取军团成员
async getGuildMember(msg: { code: string, sort: string }, session: BackendSession) {
const roleId = session.get('roleId');
// const serverId = session.get('serverId');
const { code, sort } = msg;
// 检查权限
const checkResult = await checkAuth(GUILD_OPERATE.GET_MEMBER_LIST_MAIN, roleId, code);
if(!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
if (!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
let select = ['role', 'job'];
const checkDetailResult = await checkAuth(GUILD_OPERATE.GET_MEMBER_LIST_DETAIL, roleId, code);
if(checkDetailResult) {
if (checkDetailResult) {
select.push('auth', 'activeWeekly activeUpdateTime');
}
let list = await UserGuildModel.getListByGuild(code, select.join(' '), { auth: 1 });
let result = [];
for(let cur of list) {
for (let cur of list) {
let role = <RoleType>cur.role;
delete role._id;
delete cur.role;
@@ -551,8 +551,8 @@ export class GuildHandler {
let leader = result.shift();
result.sort((a, b) => {
if(sort == 'active') {
if(b.activeWeekly == a.activeWeekly) {
if (sort == 'active') {
if (b.activeWeekly == a.activeWeekly) {
return a.activeUpdateTime - b.activeUpdateTime
} else {
return b.activeWeekly - a.activeWeekly
@@ -570,17 +570,17 @@ export class GuildHandler {
// 团长解散军团
async dismiss(msg: { code: string }, session: BackendSession) {
const roleId = session.get('roleId');
const serverId = session.get('serverId');
const { code } = msg;
// 检查权限
const checkResult = await checkAuth(GUILD_OPERATE.DISMISS, roleId, code);
if(!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
if (!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
const guild = await GuildModel.dismiss(code, serverId);
if(!guild) return resResult(STATUS.GUILD_DELETE_ERROR);
if (!guild) return resResult(STATUS.GUILD_DELETE_ERROR);
await UserGuildModel.dismiss(code);
const { members } = guild;
@@ -590,11 +590,11 @@ export class GuildHandler {
// 删除channel
let chatSid = await getGuildChannelSid(code);
this.app.rpc.chat.guildRemote.dismiss.toServer(chatSid,code);
this.app.rpc.chat.guildRemote.dismiss.toServer(chatSid, code);
let r = new Rank(REDIS_KEY.GUILD_ACTIVE_RANK, {serverId});
let r = new Rank(REDIS_KEY.GUILD_ACTIVE_RANK, { serverId });
await r.removeFromRank({ guildCode: code });
let r2 = new Rank(REDIS_KEY.GUILD_LV_RANK, {serverId});
let r2 = new Rank(REDIS_KEY.GUILD_LV_RANK, { serverId });
await r2.removeFromRank({ guildCode: code });
return resResult(STATUS.SUCCESS, { code, status: guild.status });
@@ -602,7 +602,7 @@ export class GuildHandler {
// 成员退出军团
async quit(msg: { code: string }, session: BackendSession) {
const roleId = session.get('roleId');
const roleName = session.get('roleName');
const serverId = session.get('serverId');
@@ -611,16 +611,16 @@ export class GuildHandler {
// 检查权限
const checkResult = await checkAuth(GUILD_OPERATE.QUIT, roleId, code);
if(!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
if (!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
const userGuild = await UserGuildModel.quit(code, roleId);
if(!userGuild) return resResult(STATUS.GUILD_QUIT_ERROR);
if (!userGuild) return resResult(STATUS.GUILD_QUIT_ERROR);
const role = await RoleModel.quitGuild(roleId, nowSeconds());
if(!role) return resResult(STATUS.GUILD_QUIT_ERROR);
if (!role) return resResult(STATUS.GUILD_QUIT_ERROR);
const guild = await GuildModel.quit(code, roleId, serverId, role.ce, userGuild.auth == GUILD_AUTH.MANAGER);
if(!guild) return resResult(STATUS.GUILD_QUIT_ERROR);
if (!guild) return resResult(STATUS.GUILD_QUIT_ERROR);
await updateUserInfo(REDIS_KEY.GUILD_INFO, guild.code, [{ field: 'guildCe', value: guild.guildCe }])
//删除排名信息
@@ -629,18 +629,18 @@ export class GuildHandler {
// 添加动态
const rec = await GuildRecModel.createGuildRec(roleId, code, GUILD_REC_TYPE.QUIT_GUILD, [roleName]);
let chatSid = await getGuildChannelSid(code);
this.app.rpc.chat.guildRemote.addRec.toServer(chatSid,rec);
this.app.rpc.chat.guildRemote.memberQuit.toServer(chatSid,code, roleId, guild, sid);
this.app.rpc.chat.guildRemote.addRec.toServer(chatSid, rec);
this.app.rpc.chat.guildRemote.memberQuit.toServer(chatSid, code, roleId, guild, sid);
session.set('guildCode', '');
session.push('guild', () => {});
session.push('guild', () => { });
return resResult(STATUS.SUCCESS, { hasGuild: role.hasGuild });
}
// 团长踢退出军团
async kick(msg: { code: string, roleId: string }, session: BackendSession) {
const roleId = session.get('roleId');
const roleName = session.get('roleName');
const serverId = session.get('serverId');
@@ -648,21 +648,21 @@ export class GuildHandler {
// 检查权限
const checkMyAuth = await checkAuth(GUILD_OPERATE.KICK, roleId, code);
if(!checkMyAuth) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
if (!checkMyAuth) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
// 被踢出的权限
const checkHisAuth = await checkAuth(GUILD_OPERATE.BE_KICKED, memberRoleId, code);
if(!checkHisAuth) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
if (!checkHisAuth) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
const userGuild = await UserGuildModel.quit(code, memberRoleId);
if(!userGuild) return resResult(STATUS.GUILD_KICK_ERROR);
if (!userGuild) return resResult(STATUS.GUILD_KICK_ERROR);
const role = await RoleModel.quitGuild(memberRoleId, nowSeconds());
if(!role) return resResult(STATUS.GUILD_KICK_ERROR);
if (!role) return resResult(STATUS.GUILD_KICK_ERROR);
const guild = await GuildModel.quit(code, memberRoleId, serverId, role.ce, userGuild.auth == GUILD_AUTH.MANAGER);
if(!guild) return resResult(STATUS.GUILD_KICK_ERROR);
if (!guild) return resResult(STATUS.GUILD_KICK_ERROR);
await updateUserInfo(REDIS_KEY.GUILD_INFO, guild.code, [{ field: 'guildCe', value: guild.guildCe }])
//删除排名信息
@@ -671,11 +671,11 @@ export class GuildHandler {
let chatSid = await getGuildChannelSid(code);
const { sid } = await getRoleOnlineInfo(roleId);
this.app.rpc.chat.guildRemote.memberQuit.toServer(chatSid,code, roleId, guild, sid);
this.app.rpc.chat.guildRemote.memberQuit.toServer(chatSid, code, roleId, guild, sid);
// 添加动态
const rec = await GuildRecModel.createGuildRec(roleId, code, GUILD_REC_TYPE.QUIT_GUILD, [role.roleName]);
this.app.rpc.chat.guildRemote.addRec.toServer(chatSid,rec);
this.app.rpc.chat.guildRemote.addRec.toServer(chatSid, rec);
await sendMailByContent(MAIL_TYPE.GUILD_BE_KICK, memberRoleId, { sendName: roleName, params: [guild.name] });
return resResult(STATUS.SUCCESS, { memberCnt: guild.memberCnt });
@@ -709,9 +709,9 @@ export class GuildHandler {
return resResult(STATUS.GUILD_MEMBER_NOT_FOUND);
}
let topUserGuild: UserGuildType;
for(let userGuild of topUserGuilds) {
for (let userGuild of topUserGuilds) {
let role = await RoleModel.findByRoleId(userGuild.roleId, 'quitTime');
if(role && role.quitTime > <number>getTimeFun().getBeforeDay(3)) {
if (role && role.quitTime > <number>getTimeFun().getBeforeDay(3)) {
topUserGuild = userGuild; break;
}
}
@@ -721,7 +721,7 @@ export class GuildHandler {
// 检查元宝是否够
const role = await RoleModel.findByRoleId(roleId);
if(ARMY.ARMY_IMPEACH_COST > role.gold) {
if (ARMY.ARMY_IMPEACH_COST > role.gold) {
return resResult(STATUS.DAILY_REFRESH_GOLD_LACK);
}
await handleCost(roleId, sid, [getGoldObject(ARMY.ARMY_IMPEACH_COST)]);
@@ -737,14 +737,14 @@ export class GuildHandler {
// 添加动态
let chatSid = await getGuildChannelSid(code);
const rec = await GuildRecModel.createGuildRec(roleId, code, GUILD_REC_TYPE.IMPEACH, [ oldRoleName, topUser.roleName]);
this.app.rpc.chat.guildRemote.addRec.toServer(chatSid,rec);
const rec = await GuildRecModel.createGuildRec(roleId, code, GUILD_REC_TYPE.IMPEACH, [oldRoleName, topUser.roleName]);
this.app.rpc.chat.guildRemote.addRec.toServer(chatSid, rec);
this.app.rpc.chat.guildRemote.changeLeader.toServer(chatSid,code, guild.managerCnt, topUser, leaderRoleId);
this.app.rpc.chat.guildRemote.changeLeader.toServer(chatSid, code, guild.managerCnt, topUser, leaderRoleId);
await sendMailByContent(MAIL_TYPE.GUILD_BE_IMPEACH, leaderRoleId, { sendName: roleName, params: [guild.name] });
await sendMailByContent(MAIL_TYPE.GUILD_BE_SET_LEADER, topUser.roleId, { sendName: roleName, params: [guild.name] });
await updateUserInfo(REDIS_KEY.GUILD_INFO, code, [{field: 'leader', value: new GuildLeader(topUser) } ]);
await updateUserInfo(REDIS_KEY.GUILD_INFO, code, [{ field: 'leader', value: new GuildLeader(topUser) }]);
let isOnline = await isRoleOnline(topUser.roleId);
const leader = { ...topUser, ce: topUser.ce, isOnline }
@@ -767,45 +767,45 @@ export class GuildHandler {
if (!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
const guild = await GuildModel.findByCode(code, serverId, 'lv structure');
if(!guild) {
if (!guild) {
return resResult(STATUS.GUILD_NOT_FOUND);
}
const { lv, structure } = guild;
const curStructure = structure.find(cur => cur.id == id);
if(!curStructure) {
if (!curStructure) {
return resResult(STATUS.GUILD_STRUCTURE_NOT_FOUND);
}
if(id != GUILD_STRUCTURE.ARMY_CENTER && curStructure.lv >= lv) { // 中军大帐以外建筑物
if(curStructure.lv >= lv) {
if (id != GUILD_STRUCTURE.ARMY_CENTER && curStructure.lv >= lv) { // 中军大帐以外建筑物
if (curStructure.lv >= lv) {
return resResult(STATUS.GUILD_STRUCTURE_LV_MAX);
}
}
if(!hasStructureConsume(id, curStructure.lv + 1)) {
if (!hasStructureConsume(id, curStructure.lv + 1)) {
return resResult(STATUS.GUILD_STRUCTURE_LV_MAX);
}
const cost = getStructureConsume(id, curStructure.lv);
const result = await GuildModel.upStructure(code, id, cost, 'code fund structure lv name');
if(!result) {
if (!result) {
return resResult(STATUS.GUILD_FUND_NOT_ENOUGH);
}
if(id == GUILD_STRUCTURE.ARMY_CENTER) {
if (id == GUILD_STRUCTURE.ARMY_CENTER) {
let r = new Rank(REDIS_KEY.GUILD_LV_RANK, { serverId });
await r.setRankWithGuildInfo(code, guild.lv, guild.lvUpdateTime, guild);
await r.setRankWithGuildInfo(code, guild.lv, guild.lvUpdateTime, guild);
}
const resultStructure = result.structure.find(cur => cur.id == id);
// 修改信息
let chatSid = await getGuildChannelSid(code);
this.app.rpc.chat.guildRemote.updateInfo.toServer(chatSid,code, { ...result });
await updateUserInfo(REDIS_KEY.GUILD_INFO, code, [{field: 'lv', value: result.lv } ]);
this.app.rpc.chat.guildRemote.updateInfo.toServer(chatSid, code, { ...result });
await updateUserInfo(REDIS_KEY.GUILD_INFO, code, [{ field: 'lv', value: result.lv }]);
// 添加动态
const structureName = GUILD_STRUCTURE_NAME.get(id);
const rec = await GuildRecModel.createGuildRec(roleId, code, GUILD_REC_TYPE.STRUCTURE_UP, [structureName, resultStructure.lv.toString()]);
this.app.rpc.chat.guildRemote.addRec.toServer(chatSid,rec);
this.app.rpc.chat.guildRemote.addRec.toServer(chatSid, rec);
// 军团频道聊天消息
pushGuildUpStructureMsg(roleId, roleName, result, resultStructure);
@@ -841,7 +841,7 @@ export class GuildHandler {
if (!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
const guild = await GuildModel.findByCode(code, serverId, 'members');
if(!guild) return resResult(STATUS.GUILD_NOT_FOUND);
if (!guild) return resResult(STATUS.GUILD_NOT_FOUND);
const { members } = guild;
//下发邮件
@@ -865,7 +865,7 @@ export class GuildHandler {
if (!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
const guild = await GuildModel.findByCode(code, serverId);
if(!guild) return resResult(STATUS.GUILD_NOT_FOUND);
if (!guild) return resResult(STATUS.GUILD_NOT_FOUND);
// 发送世界频道消息
this.app.rpc.chat.chatRemote.sendWorldMessage.toServer('chat-server-1', serverId, { info });
@@ -884,22 +884,22 @@ export class GuildHandler {
const { code, id } = msg;
let userGuild = await getUserGuildWithRefActive(roleId, 'receivedActive auth guildCode');
if(!userGuild) return resResult(STATUS.GUILD_NOT_FOUND);
if (!userGuild) return resResult(STATUS.GUILD_NOT_FOUND);
const checkResult = await checkAuth(GUILD_OPERATE.RECEIVE_ACTIVE, roleId, code, userGuild);
if (!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
const guild = await getGuildWithRefActive(code, serverId);
if(!guild) return resResult(STATUS.GUILD_NOT_FOUND);
if (!guild) return resResult(STATUS.GUILD_NOT_FOUND);
let activeDayReward = gameData.guildActiveDayReward.get(id);
if(!activeDayReward) return resResult(STATUS.GUILD_ACTIVE_BOX_NOT_FOUND);
if (!activeDayReward) return resResult(STATUS.GUILD_ACTIVE_BOX_NOT_FOUND);
if(guild.activeDaily < activeDayReward.activeDayPoint) {
if (guild.activeDaily < activeDayReward.activeDayPoint) {
return resResult(STATUS.GUILD_ACTIVE_POINT_NOT_REACH);
}
if(userGuild.receivedActive.includes(id)) {
if (userGuild.receivedActive.includes(id)) {
return resResult(STATUS.GUILD_ACTIVE_BOX_HAS_RECEIVED);
}
userGuild.receivedActive.push(id);
@@ -914,21 +914,21 @@ export class GuildHandler {
}
// 查看活跃排行榜
async getActiveRank(msg: { }, session: BackendSession) {
async getActiveRank(msg: {}, session: BackendSession) {
let roleId = session.get('roleId');
let serverId = session.get('serverId')
const myUserGuild = await UserGuildModel.getMyGuild(roleId, 'auth guildCode');
if(!myUserGuild) return resResult(STATUS.GUILD_NOT_FOUND);
if (!myUserGuild) return resResult(STATUS.GUILD_NOT_FOUND);
// 检查权限
const checkResult = await checkAuth(GUILD_OPERATE.GET_ACTIVE_RANK, roleId);
if(!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
if (!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
let r = new Rank(REDIS_KEY.GUILD_ACTIVE_RANK, { serverId });
let { ranks, myRank } = await r.getRankListWithMyRank({ guildCode: myUserGuild.guildCode });
if(!myRank) {
if (!myRank) {
let guild = await GuildModel.findByCode(myUserGuild.guildCode, serverId, 'code icon name lv leader activeWeekly');
myRank = await r.generMyRankWithGuild(myUserGuild.guildCode, guild.activeWeekly, guild.activeUpdateTime, guild);
}
@@ -944,7 +944,7 @@ export class GuildHandler {
const { code, active, id } = msg;
const result = await addActive(roleId, serverId, id, null, active);
if(result.status == 0) return result.resResult;
if (result.status == 0) return result.resResult;
const { guild, userGuild } = result;
let { activeDaily, activeWeekly } = guild;
@@ -956,7 +956,7 @@ export class GuildHandler {
}
// debug接口： 调用定时任务
async debugWeeklyRask(msg: { }, session: BackendSession) {
async debugWeeklyRask(msg: {}, session: BackendSession) {
await settleGuildWeekly();
return resResult(STATUS.SUCCESS);
@@ -968,7 +968,7 @@ export class GuildHandler {
const { code, count } = msg;
const guild = await GuildModel.updateInfo(code, {}, { fund: count }, 'fund');
let chatSid = await getGuildChannelSid(code);
this.app.rpc.chat.guildRemote.updateInfo.toServer(chatSid, code, {fund: guild.fund});
this.app.rpc.chat.guildRemote.updateInfo.toServer(chatSid, code, { fund: guild.fund });
return resResult(STATUS.SUCCESS, { code, fund: guild.fund });
}
@@ -980,8 +980,63 @@ export class GuildHandler {
const guild = await GuildModel.findByCode(code, serverId);
const leader = <RoleType>guild.leader;
let threeDaysBefore = <number>getTimeFun().getBeforeDay(3);
await RoleModel.updateRoleInfo(leader.roleId, { quitTime: threeDaysBefore } );
await RoleModel.updateRoleInfo(leader.roleId, { quitTime: threeDaysBefore });
return resResult(STATUS.SUCCESS, { code });
}
}
// debug接口： 加入公会
async debugJoinGuild(msg: { code: string }, session: BackendSession) {
const { code } = msg;
const roleId = session.get('roleId');
const roleName = session.get('roleName');
const serverId = session.get('serverId');
const sid = session.get('sid');
const guild = await GuildModel.findByCode(code, serverId);
if (!guild) return resResult(STATUS.GUILD_NOT_FOUND);
const { isMemberMax, isAuto, ceLimit, lv } = guild;
let role = await RoleModel.findByRoleId(roleId);
if (role.guildCode) {
let oldCode = role.guildCode;
const userGuild = await UserGuildModel.quit(oldCode, roleId);
if (!userGuild) return resResult(STATUS.GUILD_QUIT_ERROR);
role = await RoleModel.quitGuild(roleId, nowSeconds());
if (!role) return resResult(STATUS.GUILD_QUIT_ERROR);
const guild = await GuildModel.quit(oldCode, roleId, serverId, role.ce, userGuild.auth == GUILD_AUTH.MANAGER);
if (!guild) return resResult(STATUS.GUILD_QUIT_ERROR);
await updateUserInfo(REDIS_KEY.GUILD_INFO, guild.code, [{ field: 'guildCe', value: guild.guildCe }])
//删除排名信息
await removeBossRank(oldCode, roleId);
await removeTrainRank(oldCode, roleId, guild.trainId);
// 添加动态
const rec = await GuildRecModel.createGuildRec(roleId, oldCode, GUILD_REC_TYPE.QUIT_GUILD, [roleName]);
let chatSid = await getGuildChannelSid(oldCode);
this.app.rpc.chat.guildRemote.addRec.toServer(chatSid, rec);
this.app.rpc.chat.guildRemote.memberQuit.toServer(chatSid, oldCode, roleId, guild, sid);
session.set('guildCode', '');
session.push('guild', () => { });
}
const joinResult = await joinGuild(code, guild.name, lv, roleId, serverId, session);
if (joinResult.status == -1) {
return joinResult.resResult;
}
// 添加动态
const rec = await GuildRecModel.createGuildRec(roleId, code, GUILD_REC_TYPE.JOIN_GUILD, [roleName]);
// 更新人数增加
let chatSid = await getGuildChannelSid(code);
this.app.rpc.chat.guildRemote.updateInfo.toServer(chatSid, code, { memberCnt: joinResult.memberCnt, guildCe: joinResult.guildCe });
this.app.rpc.chat.guildRemote.addRec.toServer(chatSid, rec);
return resResult(STATUS.SUCCESS, { code });
}
}
game-server/app/servers/chat/handler/chatHandler.ts
+5 -3
View File
@@ -2,7 +2,7 @@ import { CHANNEL_PREFIX, MSG_SOURCE, CHANNEL_TYPE } from './../../../consts/cons
import { Application, BackendSession } from 'pinus';
import { resResult } from '../../../pubUtils/util';
import { DEFAULT_MSG_PER_PAGE, STATUS, TASK_TYPE } from '../../../consts';
import { createAccuseData, createGroupMsg, createPrivateMsg, getPrivateMessages, pushGroupMsgToRoom, pushMsgToRole, updatePrivateMsgReadInfo, recentPrivateChatInfos, recentWorldMsgs, recentSysMsgs, recentGuildMsgs, updatePrivateMsgIsTop,delPrivateMsg } from '../../../services/chatService';
import { createAccuseData, createGroupMsg, createPrivateMsg, getPrivateMessages, pushGroupMsgToRoom, pushMsgToRole, updatePrivateMsgReadInfo, recentPrivateChatInfos, recentWorldMsgs, recentSysMsgs, recentGuildMsgs, updatePrivateMsgIsTop, delPrivateMsg } from '../../../services/chatService';
import { getSimpleRoleInfo } from '../../../services/roleService';
import { checkActivityTask, checkTaskWithArgs } from '../../../services/taskService';
@@ -92,15 +92,17 @@ export class ChatHandler {
let channelId = '';
if (channel === CHANNEL_PREFIX.WORLD) channelId = `${serverId}`;
if (channel === CHANNEL_PREFIX.GUILD) channelId = guildCode;
const msgData = await createGroupMsg(roleId, roleName, channel, channelId, type, MSG_SOURCE.ROLE_SEND_TEXT, content, targetRoleId, targetMsgCode);
if (!msgData) return resResult(STATUS.WRONG_PARMS);
await pushGroupMsgToRoom(msgData);
// 任务
await checkTaskWithArgs(roleId, sid, funcs, TASK_TYPE.CHAT, [CHANNEL_TYPE.get(channel)]);
//活动任务
await checkActivityTask(serverId, sid, funcs, roleId, TASK_TYPE.CHAT, 1, { chatType: CHANNEL_TYPE.get(channel) })
return resResult(STATUS.SUCCESS);
return resResult(STATUS.SUCCESS, msgData);
}
/**
game-server/app/servers/role/handler/heroHandler.ts
+5 -5
View File
@@ -27,11 +27,11 @@ export class HeroHandler {
public async test(msg: {}, session: BackendSession) {
let sid = session.get('sid');
for(let i = 0; i < 3; i++) {
let heroes = await HeroModel.find({}).sort({createdAt: 1}).limit(1000).skip(i*1000).lean();
for(let {hid, roleId, roleName, skins} of heroes) {
for (let i = 0; i < 3; i++) {
let heroes = await HeroModel.find({}).sort({ createdAt: 1 }).limit(1000).skip(i * 1000).lean();
for (let { hid, roleId, roleName, skins } of heroes) {
await HeroModel.updateHeroInfo(roleId, hid, { skins: [] });
for(let {id, enable } of skins) {
for (let { id, enable } of skins) {
console.log(i, roleId, roleName, id);
await addSkin(roleId, roleName, id, enable);
}
@@ -213,7 +213,7 @@ export class HeroHandler {
let { star: oldStar, starStage: oldStarStage, quality } = hero;
if (oldStar != star || oldStarStage != starStage) {
return resResult(STATUS.WRONG_PARMS);
return resResult(STATUS.WRONG_PARMS, { oldStarStage, oldStar, star, starStage });
}
if (oldStar == HERO_GROW_MAX.STAR) {
return resResult(STATUS.ROLE_STAR_REACH_MAX);
game-server/app/services/activity/gachaService.ts
+30 -28
View File
@@ -109,10 +109,12 @@ export class GachaPull {
constructor(gachaType: GACHA_ID, lv: number, userHeroes: HeroType[]) {
this.gachaType = gachaType;
if(gachaType == GACHA_ID.NORMAL) { // 元宝招募，金色武将保底，按次数给保底，抽到就重新计算次数，单抽也算
this.dicFloorType = GACHA_FLOOR_TYPE.GOLD;
if (gachaType == GACHA_ID.NORMAL) { // 元宝招募，金色武将保底，按次数给保底，抽到就重新计算次数，单抽也算
this.dicFloorType = GACHA_FLOOR_TYPE.GOLD;
} else if (gachaType == GACHA_ID.ASSIGN || gachaType == GACHA_ID.TIMELIMIT) { // 求贤若渴，和活动抽卡金色保底，伪随机，n次内给且只给一个，单抽也算
this.dicFloorType = GACHA_FLOOR_TYPE.ASSIGN;
} else {
this.dicFloorType = GACHA_FLOOR_TYPE.GOLD;
}
this.userHeroes = userHeroes;
this.lv = lv;
@@ -124,23 +126,23 @@ export class GachaPull {
let percent = dicGacha.percent;
// 设置pickup的武将
let newPercent = [];
for(let { id, weight } of percent) {
if(id == gameData.gachaContentHero.get(0)) {
for (let { id, weight } of percent) {
if (id == gameData.gachaContentHero.get(0)) {
newPercent.push({ id, weight, goodId: userGacha.pickHero })
} else {
newPercent.push({ id, weight });
}
}
this.percent = newPercent;
if(dicGacha.floorReward > 0) {
if (dicGacha.floorReward > 0) {
this.dicFloor = this.percent[dicGacha.floorReward - 1];
}
this.dicFloorCount = getDicGachaFloor(this.dicFloorType);
// 玩家数据
let userFloor = userGacha.floor.find(cur => cur.id == this.dicFloorType);
if(userFloor) {
if (userFloor) {
this.floorCount = userFloor.count;
this.hasGetFloor = userFloor.hasGetFloor||false;
this.hasGetFloor = userFloor.hasGetFloor || false;
}
this.hope = userGacha.hope;
}
@@ -150,27 +152,27 @@ export class GachaPull {
this.hasGetFloor = item.hasGetFloor;
this.percent = item.percent;
this.dicFloorCount = item.floorCount;
if(item.floorReward >= 0) {
if (item.floorReward >= 0) {
this.dicFloor = item.percent[item.floorReward]
}
}
private getFloorResult(base: { id: number, weight: number, goodId?: number }) {
if(!this.dicFloor) return base;
if (!this.dicFloor) return base;
let isTarget = base.id == this.dicFloor.id; // 是否抽到的就是那个保底
if(this.dicFloorType == GACHA_FLOOR_TYPE.GOLD) { // 元宝招募 橙色 按次数保底，抽到就重计
if(isTarget || this.floorCount + 1 >= this.dicFloorCount) {
if (this.dicFloorType == GACHA_FLOOR_TYPE.GOLD) { // 元宝招募 橙色 按次数保底，抽到就重计
if (isTarget || this.floorCount + 1 >= this.dicFloorCount) {
this.floorCount = 0;
return this.dicFloor;
} else {
this.floorCount ++;
this.floorCount++;
return base;
}
} else if (this.dicFloorType == GACHA_FLOOR_TYPE.ASSIGN) {
let result = base;
if(isTarget || this.floorCount + 1 >= this.dicFloorCount) {
if(this.hasGetFloor) { // 已经获得过一次保底了, 不给，换个给
if (isTarget || this.floorCount + 1 >= this.dicFloorCount) {
if (this.hasGetFloor) { // 已经获得过一次保底了, 不给，换个给
let { dic } = getRandEelmWithWeight(this.percent.filter(cur => cur.id != this.dicFloor.id));
result = dic
} else {
@@ -178,16 +180,16 @@ export class GachaPull {
result = this.dicFloor;
}
}
this.floorCount ++;
if(this.floorCount >= this.dicFloorCount) {
this.floorCount++;
if (this.floorCount >= this.dicFloorCount) {
this.hasGetFloor = false;
this.floorCount = 0;
}
console.log('******', this.floorCount, this.dicFloorCount, this.hasGetFloor )
console.log('******', this.floorCount, this.dicFloorCount, this.hasGetFloor)
return result;
} else {
return base
}
}
}
/**
@@ -201,7 +203,7 @@ export class GachaPull {
let { type, param, count } = dic;
if (type == GACHA_CONTENT_TYPE.HERO) {
let pool: number[] = [];
if(this.hope.length > 0) {
if (this.hope.length > 0) {
pool = this.getPoolByHope(this.hope, param[0]); // 根据心愿单获得卡池
} else {
pool = getAllHeroByQuality(param[0]); // 没有心愿单就根据武将颜色
@@ -251,7 +253,7 @@ export class GachaPull {
if (h.hasGet) hasGetHope.push(h.id);
}
}
let list = gameData.gachaHope.map(cur => {
return { ...cur, hasGet: hopeMap.get(cur.id)?.hasGet || false };
})
@@ -303,17 +305,17 @@ export class GachaPull {
}
private getPurpleFloor(count: number, index: number, contentId: number, resultList: GachaResult[]) {
if(this.gachaType == GACHA_ID.NORMAL && count == 10 && index == count - 1) { // 10连到最后一抽
if (this.gachaType == GACHA_ID.NORMAL && count == 10 && index == count - 1) { // 10连到最后一抽
let { type, param } = gameData.gachaContent.get(contentId);
if(type != GACHA_CONTENT_TYPE.HERO || param[0] < HERO_QUALITY_TYPE.PURPLE) {
if (type != GACHA_CONTENT_TYPE.HERO || param[0] < HERO_QUALITY_TYPE.PURPLE) {
let hasPurple = false;
for(let { contentId } of resultList) {
for (let { contentId } of resultList) {
let { type, param } = gameData.gachaContent.get(contentId);
if(type == GACHA_CONTENT_TYPE.HERO && param[0] >= HERO_QUALITY_TYPE.PURPLE) {
if (type == GACHA_CONTENT_TYPE.HERO && param[0] >= HERO_QUALITY_TYPE.PURPLE) {
hasPurple = true; break;
}
}
if(!hasPurple) {
if (!hasPurple) {
return gameData.gachaContentHero.get(HERO_QUALITY_TYPE.PURPLE);
}
}
@@ -324,9 +326,9 @@ export class GachaPull {
// 获得需要储存的数据
// 一般抽卡getter
public getUserGachaParam(userGacha: UserGachaType) {
let floor = userGacha.floor||[];
let floor = userGacha.floor || [];
let curFloor = floor.find(cur => cur.id == this.dicFloorType);
if(curFloor) {
if (curFloor) {
curFloor.hasGetFloor = this.hasGetFloor;
curFloor.count = this.floorCount;
} else {