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

更新一下const的使用

Browse Source
This commit is contained in:
luying
2020-12-09 17:23:15 +08:00
parent 0bec9d8020
commit b052568832
10 changed files with 69 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
shared/consts/consts.ts
View File

@@ -46,7 +46,9 @@ export const CONSUME_TYPE = {
CONSUME: 1, // 消耗品
SOUL: 2, // 将魂
BLUEPRT: 3, // 藏宝图
POINT: 4 // 远征币等
POINT: 4, // 远征币等
EXP: 5, // 经验书
FAVOUR: 6 // 好感度道具
};
const itid_array = [
@@ -72,6 +74,8 @@ const itid_array = [
{ id: 20, name: '布鞋', goodType: GOOD_TYPE.EQUIP },
{ id: 21, name: '饰品', goodType: GOOD_TYPE.EQUIP },
{ id: 22, name: '消耗类物品（图纸类）', goodType: GOOD_TYPE.CONSUMES, type: CONSUME_TYPE.CONSUME },
{ id: 35, name: '消耗类物品（经验书）', goodType: GOOD_TYPE.CONSUMES, type: CONSUME_TYPE.EXP },
{ id: 36, name: '消耗类物品（好感道具）', goodType: GOOD_TYPE.CONSUMES, type: CONSUME_TYPE.FAVOUR },
{ id: 23, name: '消耗类物品（材料类）', goodType: GOOD_TYPE.CONSUMES, type: CONSUME_TYPE.CONSUME },
{ id: 24, name: '消耗类物品（宝箱类）', goodType: GOOD_TYPE.CONSUMES, type: CONSUME_TYPE.CONSUME },
{ id: 26, name: '武将碎片', goodType: GOOD_TYPE.CONSUMES, type: CONSUME_TYPE.SOUL },

4
shared/consts/statusCode.ts
View File

@@ -114,11 +114,13 @@ export const STATUS = {
// 通用 30000 - 30099
ROLE_INFO_NOT_FOUND: { code: 30000, simStr: '数据表未找到' },
ROLE_MATERIAL_NOT_ENOUGH: { code: 30001, simStr: '材料数量不足' },
// 武将养成通用 30100 - 30199
HERO_JOB_REACH_MAX_STAGE: {code: 30100, simStr: '武将已达到最大的职业阶级'},
HERO_JOB_STAGE_REACH_MAX_STAGE: {code: 30101, simStr: '武将已训练到最大阶段'},
// 武将合成，升级，升星，升品相关 30200 - 30299
ROLE_HERO_EXISTS: {code: 30200, simStr: '已存在武将不可合成' },
ROLE_METERIAL_ERROR: {code: 30201, simStr: '材料错误' },
// 武将训练，好感度，羁绊，时装相关 30300 - 30399
// 社交相关状态 40000 - 49999

11
shared/db/Hero.ts
View File

@@ -1,7 +1,6 @@
import BaseModel from './BaseModel';
import { index, getModelForClass, prop, Ref, mongoose } from '@typegoose/typegoose';
import Equip from './Equip';
import { updateCe } from '../pubUtils/util';
/**
* 英雄表
@@ -12,7 +11,7 @@ interface heroUpdate {
ce?: number;
star?: number;
starStage?: number;
fire?: number;
colorStar?: number;
fireStage?: number;
quality?: number;
job?:number;
@@ -62,7 +61,7 @@ export default class Hero extends BaseModel {
@prop({ required: true, default: 0 })
starStage: number; // 星级六维阶段
@prop({ required: true, default: 0 })
fire: number; // 觉醒， 彩星
colorStar: number; // 觉醒， 彩星
@prop({ required: true, default: 0 })
fireStage: number; // 觉醒六维阶段
@@ -115,17 +114,15 @@ export default class Hero extends BaseModel {
const hero = await HeroModel.findOneAndUpdate({ roleId, hid }, {$push: {equips: equipId}}, {new: true}).lean(lean);
if (hero) {
await Equip.putOn(hero.hid, equipId);
await updateCe(roleId, hero )
}
return hero;
}
public static async createHero(heroInfo: {roleId: string, roleName: string, hid: number, star: number, hName: string, seqId: number, lv?:number, ce: number}, lean = true) {
public static async createHero(heroInfo: {roleId: string, roleName: string, hid: number, hName: string, star: number, quality: number, job: number, lv?: number }, lean = true) {
const doc = new HeroModel();
const update = Object.assign(doc.toJSON(), heroInfo);
delete update._id;
const hero = await HeroModel.findOneAndUpdate({roleId: heroInfo.roleId, hid: heroInfo.hid}, update, {upsert: true, new: true}).lean(lean);
await updateCe(heroInfo.roleId, hero);
const hero = await HeroModel.findOneAndUpdate({roleId: heroInfo.roleId, hid: heroInfo.hid}, update, {upsert: true, new: true}).select('hid hName lv exp star starStage colorStar fireStage quality job jobStage connections favour favourLv skins equips').lean(lean);
return hero;
}

6
shared/pubUtils/actor.ts
View File

@@ -7,7 +7,7 @@ export default class Actor {
private lv: number = 0;
private oldCe: number = 0;
private star: number = 0;
private fire: number = 0;
private colorStar: number = 0;
private equips: Array<any> = [];
private conections: Array<{id: number;name: string;valid: boolean;}> = [];
/**被动技能 */
@@ -19,9 +19,9 @@ export default class Actor {
this.lv = hero.lv;
this.oldCe = hero.ce;
this.star = hero.star;
this.fire = hero.fire;
this.colorStar = hero.colorStar;
this.equips = hero.equips;
console.log(this.hid, this.lv, this.oldCe, this.star, this.fire, this.conections);
console.log(this.hid, this.lv, this.oldCe, this.star, this.colorStar, this.conections);
this.updateActorEffect();
}