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/services/role/checkMaterial.ts
+3 -3
View File
@@ -1,5 +1,5 @@
import { CURRENCY_TYPE, HANDLE_REWARD_TYPE, CURRENCY_BY_TYPE } from '../../consts';
import Role, { RoleType } from '../../db/Role';
import { RoleModel, RoleType } from '../../db/Role';
import { ItemModel, ItemType } from '../../db/Item';
import { ItemInter, RewardInter, } from '../../pubUtils/interface';
import { gameData } from '../../pubUtils/data';
@@ -120,7 +120,7 @@ export class CheckMeterial {
private async decreaseGold(gold: { count: number }[]) {
if(!this.itemsIndb.has(this.goldId)) {
let role = await Role.findByRoleId(this.roleId, 'gold coin');
let role = await RoleModel.findByRoleId(this.roleId, 'gold coin');
this.itemsIndb.set(this.goldId, role.gold);
this.itemsIndb.set(this.coinId, role.coin);
}
@@ -138,7 +138,7 @@ export class CheckMeterial {
private async decreaseCoin(coin: number[]) {
if(!this.itemsIndb.has(this.coinId)) {
let role = await Role.findByRoleId(this.roleId, 'gold coin');
let role = await RoleModel.findByRoleId(this.roleId, 'gold coin');
this.itemsIndb.set(this.goldId, role.gold);
this.itemsIndb.set(this.coinId, role.coin);
}
game-server/app/services/role/rewardService.ts
+9 -9
View File
@@ -1,6 +1,6 @@
import { ITID, CONSUME_TYPE, ITEM_TABLE, CURRENCY_TYPE, MAIL_TYPE, HANDLE_REWARD_TYPE, HERO_SYSTEM_TYPE, CURRENCY_BY_TYPE, ITEM_CHANGE_REASON, TA_USERSET_TYPE, TA_EVENT, POP_UP_SHOP_CONDITION_TYPE, ROLE_SELECT, FIGURE_UNLOCK_CONDITION, PUSH_ROUTE, ACTIVITY_TYPE } from '../../consts';
import { getDecimalCnt, getRandEelm, getRandEelmWithWeight, getRandValueByMinMax, } from '../../pubUtils/util';
import Role, { RoleType } from '../../db/Role';
import { RoleModel, RoleType } from '../../db/Role';
import { setAp } from '../actionPointService';
import { ItemModel, } from '../../db/Item';
import { ItemInter, } from '../../pubUtils/interface';
@@ -38,7 +38,7 @@ export async function handleCost(roleId: string, sid: string, goods: Array<ItemI
let resArtifacts: ArtifactModelType[] = [];
// 检查货币是否充足
let role = await Role.findByRoleId(roleId);
let role = await RoleModel.findByRoleId(roleId);
if (gold.length > 0 || coin.length > 0) {
let { gold: originGold, coin: originCoin } = role;
for(let {count} of gold) { originGold -= count };
@@ -127,7 +127,7 @@ export async function handleCost(roleId: string, sid: string, goods: Array<ItemI
if (gold.length > 0 || coin.length > 0) {
let costGold = gold.reduce((pre, cur) => pre + cur.count, 0);
let costCoin = coin.reduce((pre, cur) => pre + cur, 0);
role = await Role.decreaseGoldAndCoin(roleId, gold, costCoin);
role = await RoleModel.decreaseGoldAndCoin(roleId, gold, costCoin);
sendMessageToUserWithSuc(roleId, PUSH_ROUTE.PLAYER_DATA_CHANGE, { gold: role.gold, coin: role.coin, totalCost: role.totalCost }, sid);
if(costGold > 0) {
@@ -150,7 +150,7 @@ export async function addItems(roleId: string, roleName: string, sid: string, go
goods = filterGoods(goods, obj => obj.id, roleId, reason);
let { items, jewels, gold, coin, ap, skins, figures, artifacts, activityItems } = sortItems(goods, HANDLE_REWARD_TYPE.RECEIVE);
let showItems: { id: number, seqId?: number|string, count: number, isBag?: boolean, expireTime?: number }[] = [];
let role = await Role.findByRoleId(roleId, '-warCount -topLineup');
let role = await RoleModel.findByRoleId(roleId, '-warCount -topLineup');
// 1. 装备处理
if(jewels.length > 0) {
let { jewelCount = 0 } = role;
@@ -202,7 +202,7 @@ export async function addItems(roleId: string, roleName: string, sid: string, go
await setAp(role.serverId, roleId, null, role.lv, ap, sid, reason);
let incCoin = coin.reduce((pre, cur) => pre + cur, 0);
let incGold = gold.reduce((pre, cur) => pre + cur.count, 0);
role = await Role.increaseGoldAndCoin(roleId, gold, incCoin);
role = await RoleModel.increaseGoldAndCoin(roleId, gold, incCoin);
sendMessageToUserWithSuc(roleId, PUSH_ROUTE.PLAYER_DATA_CHANGE, { gold: role.gold, coin: role.coin }, sid);
if(gold.length > 0) {
@@ -368,10 +368,10 @@ export async function checkHeroEquips(roleId: string, quality: number) {
*/
export async function unlockFigure(sid: string, roleId: string, conditions: { type: number, paramHid?: number, paramFavourLv?: number, paramSkinId?: number, paramWinStreakNum?: number }[], role?: RoleType) {
if (!role || !role.heads || !role.frames) {
role = await Role.findByRoleId(roleId, ROLE_SELECT.GET_HEADS);
role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.GET_HEADS);
}
let { figureInfo, heads, frames, spines } = unlockFigureWithoutSave(conditions, role);
role = await Role.updateRoleInfo(roleId, { heads, frames, spines });
role = await RoleModel.updateRoleInfo(roleId, { heads, frames, spines });
if (!!figureInfo && (figureInfo.heads.length > 0 || figureInfo.frames.length > 0 || figureInfo.spines.length > 0)) {
sendMessageToUserWithSuc(roleId, PUSH_ROUTE.HEAD_CHANGE, { ...figureInfo }, sid);
}
@@ -686,7 +686,7 @@ export function checkVoucherId(id: number) {
// 直接获得形象/相框
export async function addFigure(roleId: string, ids: number[], reason: number) {
let role = await Role.findByRoleId(roleId, ROLE_SELECT.GET_HEADS);
let role = await RoleModel.findByRoleId(roleId, ROLE_SELECT.GET_HEADS);
if (!role) return false;
let { heads, frames, spines } = role;
@@ -712,7 +712,7 @@ export async function addFigure(roleId: string, ids: number[], reason: number) {
}
}
role = await Role.updateRoleInfo(roleId, { heads, frames, spines });
role = await RoleModel.updateRoleInfo(roleId, { heads, frames, spines });
return figureInfo;
}