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

形象：修改字典表

Browse Source
This commit is contained in:
luying
2021-03-11 19:30:40 +08:00
parent 95f4221217
commit d0a1515298
20 changed files with 1028 additions and 965 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/db/ComBattleTeam.ts
+4 -4
View File
@@ -1,6 +1,6 @@
import BaseModel from './BaseModel';
import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
import { FIGURE } from '../pubUtils/dicParam';
import { EXTERIOR } from '../pubUtils/dicParam';
export class RoleStatus {
@prop({ required: true })
@@ -27,13 +27,13 @@ export class RoleStatus {
@prop({ required: false, default: false })
isFrd: boolean;
// 头像
@prop({ required: true, default: FIGURE.DEFAULT_HEAD })
@prop({ required: true, default: EXTERIOR.EXTERIOR_FACE })
head: number;
// 相框
@prop({ required: true, default: FIGURE.DEFAULT_FRAME })
@prop({ required: true, default: EXTERIOR.EXTERIOR_FACECASE })
frame: number;
// 形象
@prop({ required: true, default: FIGURE.DEFAULT_SPINE })
@prop({ required: true, default: EXTERIOR.EXTERIOR_APPEARANCE })
spine: number;
// 前五战力
@prop({ required: true, default: 0 })
shared/db/PvpHistoryOpp.ts
+4 -4
View File
@@ -2,7 +2,7 @@ import BaseModel from './BaseModel';
import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
import { PvpEnemies, PvpOtherHeroes } from '../domain/dbGeneral';
import { FIGURE } from '../pubUtils/dicParam';
import { EXTERIOR } from '../pubUtils/dicParam';
export class HeroScores {
@prop({ required: true })
@@ -21,11 +21,11 @@ export default class PvpHistoryOpp extends BaseModel {
oppRoleId: string; // 对手角色 id
@prop({ required: true })
roleName: string; // 角色名称
@prop({ required: true, default: FIGURE.DEFAULT_HEAD })
@prop({ required: true, default: EXTERIOR.EXTERIOR_FACE })
head: number; // 对手头像
@prop({ required: true, default: FIGURE.DEFAULT_FRAME })
@prop({ required: true, default: EXTERIOR.EXTERIOR_FACECASE })
frame: number; // 对手相框
@prop({ required: true, default: FIGURE.DEFAULT_SPINE })
@prop({ required: true, default: EXTERIOR.EXTERIOR_APPEARANCE })
spine: number; // 对手形象
@prop({ required: true, default: 0 })
score: number; // 对手军功
shared/db/PvpRecord.ts
+4 -4
View File
@@ -3,7 +3,7 @@ import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoos
import { getBeforeDayDate } from '../pubUtils/timeUtil';
import { genCode } from '../pubUtils/util';
import { PvpHeroInfo } from '../domain/dbGeneral';
import { FIGURE } from '../pubUtils/dicParam';
import { EXTERIOR } from '../pubUtils/dicParam';
export class HeroesRecord {
@prop({ required: true, default: 0 })
@@ -42,11 +42,11 @@ export class PlayerInfo {
roleName: string; // 角色 名
@prop({ required: true, default: 0 })
lv: number; // 等级
@prop({ required: true, default: FIGURE.DEFAULT_HEAD })
@prop({ required: true, default: EXTERIOR.EXTERIOR_FACE })
head: number; // 头像
@prop({ required: true, default: FIGURE.DEFAULT_FRAME })
@prop({ required: true, default: EXTERIOR.EXTERIOR_FACECASE })
frame: number; // 相框
@prop({ required: true, default: FIGURE.DEFAULT_SPINE })
@prop({ required: true, default: EXTERIOR.EXTERIOR_APPEARANCE })
spine: number; // 形象
@prop({ required: true, default: 0 })
title: number; // 爵位
shared/db/Role.ts
+26 -7
View File
@@ -6,7 +6,7 @@ import { shouldRefresh, reduceCe } from '../pubUtils/util';
import { initRoleAtrr } from '../pubUtils/playerCe';
import { nowSeconds } from '../pubUtils/timeUtil';
import { Figure } from '../domain/dbGeneral';
import { FIGURE } from '../pubUtils/dicParam';
import { EXTERIOR } from '../pubUtils/dicParam';
import Hero from './Hero';
// role表属性格式
@@ -124,26 +124,26 @@ export default class Role extends BaseModel {
@prop({ required: true, type: Number })
showLineup: number[]; // 展示阵容
@prop({ required: true, type: Figure, default: [], _id: false })
@prop({ required: true, type: Figure, default: getDefualtFigure('head'), _id: false })
heads: Figure[]; // 拥有头像列表
@prop({ required: true, type: Figure, default: [], _id: false })
@prop({ required: true, type: Figure, default: getDefualtFigure('frame'), _id: false })
frames: Figure[]; // 拥有相框列表
@prop({ required: true, type: Figure, default: [], _id: false })
@prop({ required: true, type: Figure, default: getDefualtFigure('spine'), _id: false })
spines: Figure[]; // 拥有的形象
public get head () { // 虚拟字段head 当前头像
let curHead = this.heads?.find(cur => cur.enable && cur.time > nowSeconds());
return curHead?curHead.id: FIGURE.DEFAULT_HEAD;
return curHead?curHead.id: EXTERIOR.EXTERIOR_FACE;
}
public get frame () { // 虚拟字段frame 当前相框
let curFrame = this.frames?.find(cur => cur.enable && cur.time > nowSeconds());
return curFrame?curFrame.id: FIGURE.DEFAULT_FRAME;
return curFrame?curFrame.id: EXTERIOR.EXTERIOR_FACECASE;
}
public get spine () { // 虚拟字段spine 当前形象
let curSpine = this.spines?.find(cur => cur.enable && cur.time > nowSeconds());
return curSpine?curSpine.id: FIGURE.DEFAULT_SPINE;
return curSpine?curSpine.id: EXTERIOR.EXTERIOR_APPEARANCE;
}
@prop({ required: true, default: 0 })
@@ -551,6 +551,10 @@ export default class Role extends BaseModel {
return result;
}
public static async addFigure(roleId: string, id: number, figure: Figure) {
const result = await RoleModel.findOneAndUpdate({roleId}, { $pull: { heads: { id: id }, $push: { heads: figure } }}, {new: true}).lean();
return result
}
}
export const RoleModel = getModelForClass(Role);
@@ -567,3 +571,18 @@ function getInitialTeraph() {
}
return teraphs;
}
function getDefualtFigure(type: string) {
let figures = new Array<Figure>();
if(type == 'head') {
let figure = new Figure(EXTERIOR.EXTERIOR_FACE, true, null, true);
figures.push(figure);
} else if (type == 'frame') {
let figure = new Figure(EXTERIOR.EXTERIOR_FACECASE, true, null, true);
figures.push(figure);
} else if (type == 'spine') {
let figure = new Figure(EXTERIOR.EXTERIOR_APPEARANCE, true, null, true);
figures.push(figure);
}
return figures;
}