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

Revert "✨ feat(db): 修改role表数据库操作方式"

Browse Source 
This reverts commit e39af3649288cc5802739cfe862c818fe56e194e.
This commit is contained in:
luying
2023-05-22 19:43:21 +08:00
parent 2d45b2c66c
commit 7bc9e1fe49
79 changed files with 423 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/role/handler/friendHandler.ts
+25 -25
View File
@@ -1,7 +1,7 @@
import { Application, BackendSession, ChannelService, HandlerService, } from "pinus";
import { resResult, getRandEelm, getResStr, shouldRefresh, sortArrRandom, checkRoleIsRobot, getRobotSysType, makeRobotId, parseNumberList } from "../../../pubUtils/util";
import { STATUS, ROLE_SELECT, FRIEND_DROP_TYPE, FRIEND_RELATION_TYPE, POPULATE_TYPE, BLOCK_OPEATE, CONSUME_TYPE, ITID, HERO_SELECT, REDIS_KEY, MSG_SOURCE, MSG_TYPE, TASK_TYPE, ROBOT_SYS_TYPE, ITEM_CHANGE_REASON, PUSH_ROUTE } from "../../../consts";
import Role, { RoleModel, RoleType } from "../../../db/Role";
import { RoleModel, RoleType } from "../../../db/Role";
import { getTimeFun, getZeroPointD } from "../../../pubUtils/timeUtil";
import { FriendApplyModel } from "../../../db/FriendApply";
import { FriendListParam, FriendRecommendParams, BlackListParam, FriendValueListParam, HeroDetailParam } from "../../../domain/roleField/friend";
@@ -50,7 +50,7 @@ export class FriendHandler {
const day = <number>getTimeFun().getBeforeHour(FRIEND.FRIEND_RECONMMEND_ACTIVETIME);
const { lv, serverId: myServerId } = await Role.findByRoleId(roleId, ROLE_SELECT.GET_MY_SERVER);
const { lv, serverId: myServerId } = await RoleModel.findByRoleId(roleId, ROLE_SELECT.GET_MY_SERVER);
let nums = parseNumberList(FRIEND.FRIEND_RECONMMEND_LEVEL);
// let max = Math.max(...nums);
let recommendList = await RoleModel.find({ loginTime: { $gt: day }, hasInit: true }).limit(200).lean({ getters: true, virtuals: true })
@@ -117,7 +117,7 @@ export class FriendHandler {
let roleId: string = session.get('roleId');
let { value } = msg;
let allList = await Role.searchByNameOrId(value);
let allList = await RoleModel.searchByNameOrId(value);
let myFriendRelation = await FriendRelationModel.findFriendByRole(roleId, POPULATE_TYPE.NOT);
let list = new Array<FriendRecommendParams>();
@@ -141,7 +141,7 @@ export class FriendHandler {
let roleId: string = session.get('roleId');
let roleIds = msg.roleIds;
const role = await Role.findByRoleId(roleId, ROLE_SELECT.GET_ROLE_ID);
const role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.GET_ROLE_ID);
let myFriendRelation = await FriendRelationModel.findFriendByRole(roleId, POPULATE_TYPE.NOT);
let str = '', resultRoleIds = new Array<string>();
@@ -157,7 +157,7 @@ export class FriendHandler {
let hisRelation = await FriendRelationModel.findFriendByRole(hisRoleId, POPULATE_TYPE.NOT);
let hisType = getRecommendType(hisRelation, hisRoleId, roleId);
if(hisType == FRIEND_RELATION_TYPE.NORMAL) {
let incResult = await Role.increaseFriendApplyCnt(hisRoleId, 1, FRIEND.FRIEND_MANAGE_APPLICATION);
let incResult = await RoleModel.increaseFriendApplyCnt(hisRoleId, 1, FRIEND.FRIEND_MANAGE_APPLICATION);
if (!incResult) {
str = getResStr(STATUS.FRIEND_HIS_APPLY_MAX); continue;
}
@@ -198,7 +198,7 @@ export class FriendHandler {
let { applyCodeList, isPass } = msg;
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
let roles = new Array<RoleType>();
let friendCnt = role.friendCnt;
@@ -259,7 +259,7 @@ export class FriendHandler {
}
let deleteCount = await FriendApplyModel.deleteApply(resultApplyCodeList);
role = await Role.increaseFriendApplyCnt(roleId, -1 * deleteCount, FRIEND.FRIEND_MANAGE_APPLICATION);
role = await RoleModel.increaseFriendApplyCnt(roleId, -1 * deleteCount, FRIEND.FRIEND_MANAGE_APPLICATION);
roles.push(role);
// 任务
await checkTaskWithRoles(roleId, sid, TASK_TYPE.FRIEND_NUM, roles);
@@ -280,7 +280,7 @@ export class FriendHandler {
public async getFriendList(msg: {}, session: BackendSession) {
let roleId: string = session.get('roleId');
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
let res = await getFriendList(role);
return resResult(STATUS.SUCCESS, res);
@@ -290,7 +290,7 @@ export class FriendHandler {
public async getBlackList(msg: {}, session: BackendSession) {
let roleId: string = session.get('roleId');
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
let list = new Array<BlackListParam>();
let myRelation = await FriendRelationModel.findFriendByRole(roleId, POPULATE_TYPE.BLACKLIST);
let blacklist = myRelation ? myRelation.blacklist : [];
@@ -328,7 +328,7 @@ export class FriendHandler {
const serverId = session.get('serverId');
let { roleId: hisRoleId, type } = msg;
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
let friend: RoleType;
let str = '', list = new Array<BlackListParam>(), frdRoleIds = new Array<string>(), blackRoleIds = new Array<string>();
@@ -342,11 +342,11 @@ export class FriendHandler {
return resResult(STATUS.FRIEND_BLACK_HAS_ADD);
}
role = await Role.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) {
return resResult(STATUS.FRIEND_BLACK_MAX)
}
friend = await Role.increaseFriendCnt(hisRoleId, curFriend ? -1 : 0); // 对方好友减少
friend = await RoleModel.increaseFriendCnt(hisRoleId, curFriend ? -1 : 0); // 对方好友减少
let friendShip: FriendShipType;
if (!!curFriend) {
@@ -360,8 +360,8 @@ export class FriendHandler {
await delPrivateMsg(roleId, hisRoleId);
let { myRecApplyCount, hisRecApplyCount } = await FriendApplyModel.deleteApplyByRoles(roleId, hisRoleId); // 删除双方的申请
if(myRecApplyCount > 0) await Role.increaseFriendApplyCnt(roleId, -1 * myRecApplyCount, FRIEND.FRIEND_MANAGE_APPLICATION);
if(hisRecApplyCount > 0) await Role.increaseFriendApplyCnt(roleId, -1 * hisRecApplyCount, FRIEND.FRIEND_MANAGE_APPLICATION);
if(myRecApplyCount > 0) await RoleModel.increaseFriendApplyCnt(roleId, -1 * myRecApplyCount, FRIEND.FRIEND_MANAGE_APPLICATION);
if(hisRecApplyCount > 0) await RoleModel.increaseFriendApplyCnt(roleId, -1 * hisRecApplyCount, FRIEND.FRIEND_MANAGE_APPLICATION);
let param = new BlackListParam(friend);
let { isOnline, sid } = await getRoleOnlineInfo(friend.roleId);
@@ -389,11 +389,11 @@ export class FriendHandler {
return resResult(STATUS.FRIEND_NOT_FOUND);
}
role = await Role.increaseFriendCnt(roleId, -1); // 减少好友
role = await RoleModel.increaseFriendCnt(roleId, -1); // 减少好友
if (!role) {
return resResult(STATUS.FRIEND_NOT_FOUND)
}
friend = await Role.increaseFriendCnt(hisRoleId, -1); // 对方好友减少
friend = await RoleModel.increaseFriendCnt(hisRoleId, -1); // 对方好友减少
let friendShip: FriendShipType;
@@ -414,7 +414,7 @@ export class FriendHandler {
return resResult(STATUS.FRIEND_BLACK_NOT_FOUND);
}
role = await Role.increaseBlockCnt(roleId, -1, 0, 100); // 黑名单人数减
role = await RoleModel.increaseBlockCnt(roleId, -1, 0, 100); // 黑名单人数减
if (!role) {
return resResult(STATUS.FRIEND_BLACK_MAX)
}
@@ -422,14 +422,14 @@ export class FriendHandler {
if (type == BLOCK_OPEATE.REMOVE_AND_APPLY) {
// 申请好友
friend = await Role.increaseFriendApplyCnt(hisRoleId, 1, FRIEND.FRIEND_MANAGE_APPLICATION);
friend = await RoleModel.increaseFriendApplyCnt(hisRoleId, 1, FRIEND.FRIEND_MANAGE_APPLICATION);
if (!friend) {
str = getResStr(STATUS.FRIEND_HIS_APPLY_MAX);
} else {
let hisRelation = await FriendRelationModel.findFriendByRole(hisRoleId, POPULATE_TYPE.NOT);
let hisType = getRecommendType(hisRelation, hisRoleId, roleId);
if(hisType == FRIEND_RELATION_TYPE.NORMAL) {
let incResult = await Role.increaseFriendApplyCnt(hisRoleId, 1, FRIEND.FRIEND_MANAGE_APPLICATION);
let incResult = await RoleModel.increaseFriendApplyCnt(hisRoleId, 1, FRIEND.FRIEND_MANAGE_APPLICATION);
if (incResult) {
let apply = await FriendApplyModel.createApply(hisRoleId, role);
let hisOnlineInfo = await getRoleOnlineInfo(hisRoleId);
@@ -483,7 +483,7 @@ export class FriendHandler {
}
let canSendList = await sortByBeSentHeart(roleId, arr);
let { lv } = await Role.findByRoleId(roleId, ROLE_SELECT.GET_LV);
let { lv } = await RoleModel.findByRoleId(roleId, ROLE_SELECT.GET_LV);
let dicFriendLv = getDicFriendByLv(lv);
if (!dicFriendLv) return resResult(STATUS.DIC_DATA_NOT_FOUND);
@@ -553,7 +553,7 @@ export class FriendHandler {
}
let canReceiveList = await sortByBeSentHeart(roleId, arr);
let { lv } = await Role.findByRoleId(roleId, ROLE_SELECT.GET_LV);
let { lv } = await RoleModel.findByRoleId(roleId, ROLE_SELECT.GET_LV);
let dicFriendLv = getDicFriendByLv(lv);
if (!dicFriendLv) return resResult(STATUS.DIC_DATA_NOT_FOUND);
@@ -649,7 +649,7 @@ export class FriendHandler {
let { roleId: targetRoleId } = msg;
let isRobot = checkRoleIsRobot(targetRoleId);
if(isRobot) {
let role = await Role.findByRoleId(roleId, null, true);
let role = await RoleModel.findByRoleId(roleId, null, true);
let sysType = getRobotSysType(targetRoleId);
let addObj: any = { roleId: makeRobotId(''), roleName: '', guildName: '' };
if(sysType == ROBOT_SYS_TYPE.COM_BTL) {
@@ -667,7 +667,7 @@ export class FriendHandler {
return resResult(STATUS.SUCCESS, {...param, isRobot });
} else {
let role = await Role.findByRoleId(targetRoleId, null, true);
let role = await RoleModel.findByRoleId(targetRoleId, null, true);
let myFriendRelation = await FriendRelationModel.findFriendByRole(roleId, POPULATE_TYPE.NOT);
let type = getRecommendType(myFriendRelation, roleId, role.roleId);
@@ -690,7 +690,7 @@ export class FriendHandler {
let result: PlayerDetail;
let dbHeroes = await HeroModel.findAndSortByCe(oppoRoleId);
let role = await Role.findByRoleId(oppoRoleId, null, true);
let role = await RoleModel.findByRoleId(oppoRoleId, null, true);
if(!role) return resResult(STATUS.ROLE_NOT_FOUND);
let { topLineupCe, towerLv, showLineup } = role;
@@ -732,7 +732,7 @@ export class FriendHandler {
let { roleId: hisRoleId, hids } = msg;
let role = await Role.findByRoleId(hisRoleId, 'title');
let role = await RoleModel.findByRoleId(hisRoleId, 'title');
if (!role) return resResult(STATUS.ROLE_NOT_FOUND);
let roleCe = await RoleCeModel.findByRoleId(hisRoleId);
game-server/app/servers/role/handler/heroHandler.ts
+7 -7
View File
@@ -4,7 +4,7 @@ import { resResult, deepCopy, parseGoodStr } from '../../../pubUtils/util';
import { STATUS } from '../../../consts/statusCode';
import { HeroModel, Connect, HeroSkin, HeroUpdate, EPlace, Talent } from '../../../db/Hero';
import { CURRENCY_BY_TYPE, CURRENCY_TYPE, CONSUME_TYPE, HERO_GROW_MAX, HERO_SYSTEM_TYPE, ABI_STAGE, DEBUG_MAGIC_WORD, HERO_INITIAL_QUALITY, REDIS_KEY, TASK_TYPE, ITEM_CHANGE_REASON, CHECK_HERO_CONSUME } from '../../../consts';
import Role from '../../../db/Role';
import { RoleModel } from '../../../db/Role';
import { ItemModel } from '../../../db/Item';
import { gameData, getHeroExpByLv, getHeroStarByQuality, getHeroWakeByQuality, getHeroLvByExp, getMaxGradeByjobClass, getJobByGradeAndClass, getConnectLvByExp, getEquipByJobClassAndEPlace, getScollByStar, getExpByLv, getConnectMaxLv, getFriendShipByIdAndLv } from '../../../pubUtils/data';
import { ItemInter, RewardInter } from '../../../pubUtils/interface';
@@ -89,7 +89,7 @@ export class HeroHandler {
// 计算武将可以升的级数
let hero = await HeroModel.findByHidAndRole(hid, roleId);
if (!hero) return resResult(STATUS.ROLE_HERO_NOT_EXISTS);
let { lv: playerLv } = await Role.findByRoleId(roleId);
let { lv: playerLv } = await RoleModel.findByRoleId(roleId);
let { lv: oldLv, exp: oldExp } = hero;
if (oldLv >= playerLv) return resResult(STATUS.ROLE_HERO_LV_OVER);
if (oldLv + addLv > playerLv) addLv = playerLv - oldLv;
@@ -812,7 +812,7 @@ export class HeroHandler {
await SkinModel.deleteMany({ roleId });
await SchoolModel.deleteAccount(roleId);
await RoleCeModel.deleteMany({ roleId });
await Role.updateRoleInfo(roleId, { jewelCount: 0 });
await RoleModel.updateRoleInfo(roleId, { jewelCount: 0 });
let heroInfos = [];
for(let [actorId] of gameData.recruit) {
@@ -850,9 +850,9 @@ export class HeroHandler {
if (!hero) return resResult(STATUS.HERO_NOT_FIND);
await HeroModel.deleteHero(roleId, hid);
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
await PvpDefenseModel.deleteHero(roleId, hid);
await Role.updateRoleInfo(roleId, { topLineup: role.topLineup, topLineupCe: role.topLineupCe, ce: role.ce - hero.ce });
await RoleModel.updateRoleInfo(roleId, { topLineup: role.topLineup, topLineupCe: role.topLineupCe, ce: role.ce - hero.ce });
return resResult(STATUS.SUCCESS);
}
@@ -865,14 +865,14 @@ export class HeroHandler {
//let result = await handleCost(roleId, sid, [{id, count}] );
let items = [{ id, count }];
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
if (id == 999999) {
items = getDropItems();
if (role.lv < 60) {
role.lv = 60;
let roleLvInfo = gameData.kingexp.get(role.lv - 1);
role.exp = roleLvInfo.sum;
await Role.updateRoleInfo(roleId, role);
await RoleModel.updateRoleInfo(roleId, role);
}
}
let result = await addItems(roleId, roleName, sid, items, ITEM_CHANGE_REASON.DEBUG);
game-server/app/servers/role/handler/itemHandler.ts
+7 -7
View File
@@ -4,7 +4,7 @@ import { RewardInter } from "../../../pubUtils/interface";
import { resResult } from "../../../pubUtils/util";
import { addItems, handleCost } from "../../../services/role/rewardService";
import Role from "../../../db/Role";
import { RoleModel } from "../../../db/Role";
import { gameData } from "../../../pubUtils/data";
import { ITID } from "../../../consts/constModules/itemConst";
import { useGiftPackage } from "../../../services/activity/giftPackageService";
@@ -100,7 +100,7 @@ export class ItemHandler {
return resResult(STATUS.ROLE_METERIAL_ERROR);
}
let role = await Role.findByRoleId(roleId, 'lv');
let role = await RoleModel.findByRoleId(roleId, 'lv');
let { ap, isOver } = await getAp(roleId, ip, role.lv);
if (isOver) return resResult(STATUS.AP_IS_FULL);
@@ -138,7 +138,7 @@ export class ItemHandler {
return resResult(STATUS.ROLE_METERIAL_ERROR);
}
let role = await Role.findByRoleId(roleId, 'lv');
let role = await RoleModel.findByRoleId(roleId, 'lv');
let { buyTimes = 0 } = await getAp(roleId, ip, role.lv);
if (buyTimes + count > gameData.apMaxBuyTimes.max) return resResult(STATUS.AP_BUY_TIMES_LACK);
@@ -208,7 +208,7 @@ export class ItemHandler {
let roleId = session.get('roleId');
let ip = session.get('ip');
let role = await Role.findByRoleId(roleId, 'lv');
let role = await RoleModel.findByRoleId(roleId, 'lv');
let apJson = await getAp(roleId, ip, role.lv);
return resResult(STATUS.SUCCESS, { apJson });
}
@@ -222,7 +222,7 @@ export class ItemHandler {
let lvRecord = lvRecords.find(cur => cur.lv == lv);
let ap = 0, apBefore = 0;
if(!lvRecord) {
let role = await Role.findByRoleId(roleId, 'lv');
let role = await RoleModel.findByRoleId(roleId, 'lv');
let apJson = await getAp(roleId, ip, role.lv);
ap = apJson.ap;
apBefore = apJson.ap;
@@ -244,7 +244,7 @@ export class ItemHandler {
const ip = session.get('ip');
const serverId = session.get('serverId');
let role = await Role.findByRoleId(roleId, 'lv');
let role = await RoleModel.findByRoleId(roleId, 'lv');
let apJson = await setAp(serverId, roleId, ip, role.lv, msg.ap, sid, ITEM_CHANGE_REASON.DEBUG);
if (!apJson) return resResult(STATUS.BATTLE_ACTION_POINT_LACK)
return resResult(STATUS.SUCCESS, { apJson });
@@ -257,7 +257,7 @@ export class ItemHandler {
}
let roleId = session.get('roleId');
let ip = session.get('ip');
let role = await Role.findByRoleId(roleId, 'lv');
let role = await RoleModel.findByRoleId(roleId, 'lv');
await ActionPointModel.resetBuyTimes(roleId);
let apJson = await getAp(roleId, ip, role.lv);
return resResult(STATUS.SUCCESS, { apJson });
game-server/app/servers/role/handler/mailHandler.ts
+2 -2
View File
@@ -9,7 +9,7 @@ import { checkMailGoods, getMails } from '../../../services/mailService';
import { ServerMailModel, ServerMailType } from '../../../db/ServerMail';
import { MailParam } from '../../../domain/roleField/mail';
import { ItemInter, RewardInter } from '../../../pubUtils/interface';
import Role from '../../../db/Role';
import { RoleModel } from '../../../db/Role';
import { gameData } from '../../../pubUtils/data';
import { ITEM_CHANGE_REASON, ITID, RECEIVE_MAIL_TYPE } from '../../../consts';
import { BAG } from '../../../pubUtils/dicParam';
@@ -110,7 +110,7 @@ export class MailHandler {
let sid: string = session.get('sid');
let serverId: number = session.get('serverId');
let { id, type, mailType } = msg;
let { jewelCount } = await Role.findByRoleId(roleId, 'jewelCount');
let { jewelCount } = await RoleModel.findByRoleId(roleId, 'jewelCount');
let originMails: {mailType: GM_MAIL_TYPE, mail: MailType|GroupMailType|ServerMailType}[] = []
game-server/app/servers/role/handler/rankHandler.ts
+5 -5
View File
@@ -1,7 +1,7 @@
import { Application, BackendSession, HandlerService, pinus, } from "pinus";
import { resResult } from "../../../pubUtils/util";
import { STATUS, getRedisKeyByRankType, ROLE_SELECT, RANK_TYPE, HERO_SELECT, GUILD_SELECT, RANK_FIRST_REWARD_STATUS, ITEM_CHANGE_REASON, REDIS_KEY } from "../../../consts";
import Role from "../../../db/Role";
import Role,{RoleModel} from "../../../db/Role";
import { UserGuildModel } from "../../../db/UserGuild";
import { GuildModel } from "../../../db/Guild";
import { Rank, getGeneralRank, getRankFirstReward, getRankInHandler } from "../../../services/rankService";
@@ -26,7 +26,7 @@ export class RoleHandler {
let roleName = session.get('roleName');
let serverId = session.get('serverId');
let role = await Role.findByRoleId(roleId, 'rankReceived');
let role = await RoleModel.findByRoleId(roleId, 'rankReceived');
if (!role) return resResult(STATUS.WRONG_PARMS);
let ranks = await getGeneralRank(role, serverId);
@@ -40,7 +40,7 @@ export class RoleHandler {
let roleName = session.get('roleName');
let serverId = session.get('serverId');
let role = await Role.findByRoleId(roleId, 'rankReceived');
let role = await RoleModel.findByRoleId(roleId, 'rankReceived');
if (!role) return resResult(STATUS.WRONG_PARMS);
let ranks = await getRankFirstReward(role, serverId);
@@ -189,7 +189,7 @@ export class RoleHandler {
}
let rewards: RewardInter[] = [];
let canReceiveId: number[] = [];
let role = await Role.findByRoleId(roleId, 'rankReceived');
let role = await RoleModel.findByRoleId(roleId, 'rankReceived');
for (let id of ids) {
let dicReward = gameData.generalRankReward.get(id);
@@ -205,7 +205,7 @@ export class RoleHandler {
canReceiveId.push(id);
}
role = await Role.receiveRankReward(roleId, canReceiveId);
role = await RoleModel.receiveRankReward(roleId, canReceiveId);
if (canReceiveId.length <= 0) return resResult(STATUS.REWARD_CONDITION_NOT_REACH);
let rewardStatus = canReceiveId.map(id => {
game-server/app/servers/role/handler/roleHandler.ts
+25 -25
View File
@@ -1,5 +1,5 @@
import { STATUS } from '../../../consts/statusCode';
import Role, { RoleUpdate } from './../../../db/Role';
import { RoleModel, RoleUpdate } from './../../../db/Role';
import { HeroModel, HeroType, HeroUpdate } from '../../../db/Hero';
import { resResult, decodeIdCntArrayStr, parseGoodStr, genCode } from '../../../pubUtils/util';
import { Application, BackendSession, pinus, HandlerService, } from 'pinus';
@@ -48,14 +48,14 @@ export class RoleHandler {
let { roleName } = msg;
let role = await Role.findByRoleId(roleId, 'roleName hasInit title teraphs lv', true);
let role = await RoleModel.findByRoleId(roleId, 'roleName hasInit title teraphs lv', true);
if (role.hasInit) return resResult(STATUS.ROLE_HAS_INIT);
let checkName = await Role.checkName(roleName, serverId);
let checkName = await RoleModel.checkName(roleName, serverId);
if (checkName) return resResult(STATUS.NAME_HAS_USED);
let { resultHeroes: heroes } = await createHeroes(roleId, roleName, sid, serverId, DEFAULT_HEROES.map(hid => ({hid, count: 1})), { roleName, hasInit: true, title: role.title, teraphs: role.teraphs, lv: role.lv });
// role = await Role.updateRoleInfo(roleId, { roleName, hasInit: true }); // 在算战力的时候一起更新
// role = await RoleModel.updateRoleInfo(roleId, { roleName, hasInit: true }); // 在算战力的时候一起更新
session.set('roleName', roleName);
session.push('roleName', () => { });
@@ -74,7 +74,7 @@ export class RoleHandler {
async getRoleInfo(msg: { targetRoleId: string }, session: BackendSession) {
let { targetRoleId } = msg;
let { roleId, roleName, head = EXTERIOR.EXTERIOR_FACE, frame = EXTERIOR.EXTERIOR_FACECASE, spine = EXTERIOR.EXTERIOR_APPEARANCE, ce = 0, topLineup, topLineupCe = 0 } = await Role.findByRoleId(targetRoleId);
let { roleId, roleName, head = EXTERIOR.EXTERIOR_FACE, frame = EXTERIOR.EXTERIOR_FACECASE, spine = EXTERIOR.EXTERIOR_APPEARANCE, ce = 0, topLineup, topLineupCe = 0 } = await RoleModel.findByRoleId(targetRoleId);
return resResult(STATUS.SUCCESS, { roleId, roleName, head, frame, spine, ce, topLineup, topLineupCe });
}
@@ -85,7 +85,7 @@ export class RoleHandler {
const serverId = session.get('serverId');
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
let { title } = role;
let titleInfo = getTitle(title + 1);
@@ -115,7 +115,7 @@ export class RoleHandler {
let serverId: number = session.get('serverId');
let role = await Role.findByRoleId(roleId, 'roleId teraphs gold coin');
let role = await RoleModel.findByRoleId(roleId, 'roleId teraphs gold coin');
let teraphs = role.teraphs;
let index = findIndex(teraphs, { id });
if (index < 0)
@@ -149,7 +149,7 @@ export class RoleHandler {
const serverId = session.get('serverId');
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
let teraphs = role.teraphs;
let index = findIndex(teraphs, { id });
if (index < 0)
@@ -353,7 +353,7 @@ export class RoleHandler {
return resResult(STATUS.LINEUP_MAX);
}
let role = await Role.updateRoleInfo(roleId, { showLineup });
let role = await RoleModel.updateRoleInfo(roleId, { showLineup });
let r = new Rank(REDIS_KEY.SHOW_LINEUP, {});
await r.generParamAndSet(REDIS_KEY.SHOW_LINEUP, { roleId }, { role });
@@ -368,7 +368,7 @@ export class RoleHandler {
if(isGoodsHidden(id)) return resResult(STATUS.ITEM_IS_HIDDEN);
let role = await Role.findByRoleId(roleId, ROLE_SELECT.GET_HEADS);
let role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.GET_HEADS);
if (!role) return resResult(STATUS.ROLE_NOT_FOUND);
let { heads } = role;
@@ -383,7 +383,7 @@ export class RoleHandler {
}
curHead.enable = true;
role = await Role.updateRoleInfo(roleId, { heads });
role = await RoleModel.updateRoleInfo(roleId, { heads });
await updateUserInfo(REDIS_KEY.USER_INFO, roleId, [{ field: 'head', value: id }]);
if(role.isGuildLeader) {
await updateUserInfo(REDIS_KEY.GUILD_INFO, guildCode, [{ field: 'leader', value: new GuildLeader(role) }]);
@@ -400,7 +400,7 @@ export class RoleHandler {
if(isGoodsHidden(id)) return resResult(STATUS.ITEM_IS_HIDDEN);
let role = await Role.findByRoleId(roleId, ROLE_SELECT.GET_HEADS);
let role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.GET_HEADS);
if (!role) return resResult(STATUS.ROLE_NOT_FOUND);
let { frames } = role;
@@ -415,7 +415,7 @@ export class RoleHandler {
}
curFrame.enable = true;
role = await Role.updateRoleInfo(roleId, { frames });
role = await RoleModel.updateRoleInfo(roleId, { frames });
await updateUserInfo(REDIS_KEY.USER_INFO, roleId, [{ field: 'frame', value: id }]);
if(role.isGuildLeader) {
await updateUserInfo(REDIS_KEY.GUILD_INFO, guildCode, [{ field: 'leader', value: new GuildLeader(role) }]);
@@ -432,7 +432,7 @@ export class RoleHandler {
if(isGoodsHidden(id)) return resResult(STATUS.ITEM_IS_HIDDEN);
let role = await Role.findByRoleId(roleId, ROLE_SELECT.GET_HEADS);
let role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.GET_HEADS);
if (!role) return resResult(STATUS.ROLE_NOT_FOUND);
let { spines } = role;
@@ -447,7 +447,7 @@ export class RoleHandler {
}
curSpine.enable = true;
role = await Role.updateRoleInfo(roleId, { spines });
role = await RoleModel.updateRoleInfo(roleId, { spines });
await updateUserInfo(REDIS_KEY.USER_INFO, roleId, [{ field: 'spine', value: id }]);
if(role.isGuildLeader) {
await updateUserInfo(REDIS_KEY.GUILD_INFO, guildCode, [{ field: 'leader', value: new GuildLeader(role) }]);
@@ -465,17 +465,17 @@ export class RoleHandler {
let sid = session.get('sid');
if(!roleName) return resResult(STATUS.WRONG_PARMS);
let checkName = await Role.checkName(roleName, serverId);
let checkName = await RoleModel.checkName(roleName, serverId);
if (checkName) return resResult(STATUS.NAME_HAS_USED);
let role = await Role.findByRoleId(roleId, 'renameCnt');
let role = await RoleModel.findByRoleId(roleId, 'renameCnt');
let costGold = role.renameCnt >= dicParam.NAMEPLATE.NAMEPLATE_FREECOST? dicParam.NAMEPLATE.NAMEPLATE_FEECOST: 0;
if(costGold > 0) {
let result = await handleCost(roleId, sid, [getGoldObject(costGold)], ITEM_CHANGE_REASON.RENAME);
if(!result) return resResult(STATUS.BATTLE_GOLD_NOT_ENOUGH);
}
role = await Role.incRoleInfo(roleId, { renameCnt: 1 }, { roleName });
role = await RoleModel.incRoleInfo(roleId, { renameCnt: 1 }, { roleName });
session.set('roleName', role.roleName);
session.push('roleName', () => { });
await updateUserInfo(REDIS_KEY.USER_INFO, roleId, [{ field: 'roleName', value: roleName }]);
@@ -498,7 +498,7 @@ export class RoleHandler {
if(ids == undefined || ids.length <= 0) {
return resResult(STATUS.WRONG_PARMS);
}
let role = await Role.saveGuide(roleId, ids);
let role = await RoleModel.saveGuide(roleId, ids);
return resResult(STATUS.SUCCESS, {
guide: role.guide
});
@@ -508,7 +508,7 @@ export class RoleHandler {
const roleId = session.get('roleId');
const { isClosePush } = msg;
let role = await Role.setPushMsgOpen(roleId, isClosePush);
let role = await RoleModel.setPushMsgOpen(roleId, isClosePush);
if(!role) return resResult(STATUS.ROLE_NOT_FOUND);
return resResult(STATUS.SUCCESS, {
isClosePush: role.isClosePush
@@ -519,7 +519,7 @@ export class RoleHandler {
const roleId = session.get('roleId');
const { hasComment } = msg;
let role = await Role.setHasComment(roleId, hasComment);
let role = await RoleModel.setHasComment(roleId, hasComment);
if(!role) return resResult(STATUS.ROLE_NOT_FOUND);
return resResult(STATUS.SUCCESS, {
hasComment: role.hasComment
@@ -581,7 +581,7 @@ export class RoleHandler {
}
let roleId = session.get('roleId');
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
if(!role) return resResult(STATUS.ROLE_NOT_FOUND);
if(role.hasInit) {
await deletRole(roleId);
@@ -598,7 +598,7 @@ export class RoleHandler {
let roleId = session.get('roleId');
let roleLvInfo = gameData.kingexp.get(lv - 1);
let role = await Role.updateRoleInfo(roleId, { lv, exp: roleLvInfo.sum });
let role = await RoleModel.updateRoleInfo(roleId, { lv, exp: roleLvInfo.sum });
return resResult(STATUS.SUCCESS, { lv: role.lv });
}
@@ -610,7 +610,7 @@ export class RoleHandler {
if (magicWord !== DEBUG_MAGIC_WORD) {
return resResult(STATUS.TOKEN_ERR);
}
let role = await Role.updateRoleInfo(roleId, params);
let role = await RoleModel.updateRoleInfo(roleId, params);
return resResult(STATUS.SUCCESS, { role });
@@ -624,7 +624,7 @@ export class RoleHandler {
if (magicWord !== DEBUG_MAGIC_WORD) {
return resResult(STATUS.TOKEN_ERR);
}
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
let user = await UserModel.findUserByUid(role.userInfo.uid);
reportTAEvent(roleId, 'test', { serverId }, user.ip);
game-server/app/servers/role/handler/shopHandler.ts
+2 -2
View File
@@ -11,7 +11,7 @@ import { RewardInter } from "../../../pubUtils/interface";
import { UserShopTypeModel } from "../../../db/UserShopType";
import { nowSeconds } from "../../../pubUtils/timeUtil";
import { isGoodsHidden } from "../../../services/dataService";
import Role from './../../../db/Role';
import { RoleModel } from './../../../db/Role';
export default function(app: Application) {
return new ShopHandler(app);
@@ -86,7 +86,7 @@ export class ShopHandler {
userShop = await UserShopModel.purchase(roleId, roleName, activityId, dicShopItem, count, seasonNum);
if (!userShop || (userShop && userShop.count > totalCanBuyTimes)) {
// rollback 消耗
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
addItems(roleId, role.roleName, sid, cost, ITEM_CHANGE_REASON.SHOP_PURCHASE);
// rollback 购买次数
game-server/app/servers/role/handler/taskHandler.ts
+2 -2
View File
@@ -11,7 +11,7 @@ import { getMainTask, refDailyTaskBox, removeHistoryTask, getCurTask, checkTask,
import { TASK } from "../../../pubUtils/dicParam";
import { ActivityTaskPointModel, ActivityTaskPointModelType } from "../../../db/ActivityTaskPoint";
import { ItemInter, RewardInter } from "../../../pubUtils/interface";
import Role from "../../../db/Role";
import { RoleModel } from "../../../db/Role";
import { roleLevelup } from "../../../services/normalBattleService";
import _ = require("underscore");
import { addActvityTaskPoint } from "../../../services/activity/activityService";
@@ -333,7 +333,7 @@ export class ShopHandler {
let roleId = session.get('roleId');
let serverId = session.get('serverId');
let sid = session.get('sid');
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
let server = await ServerlistModel.findByServerId(serverId);
return resResult(STATUS.SUCCESS)
}