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

炼器堂

Browse Source
This commit is contained in:
mamengke01
2021-01-26 16:50:14 +08:00
parent d8cc01f036
commit fb56dd00ec
19 changed files with 338 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
shared/consts/constModules/guildConst.ts
View File

@@ -121,7 +121,9 @@ export enum GUILD_DATA_NAME {
BOSS_SCRIPT = 'BossInstance',
TRAIN = 'BossInstance',
TRAIN_BOX = 'BossInstanceBox',
GUILD = 'Guild'
GUILD = 'Guild',
GUILD_REFINE = 'GuildRefine',
GUILD_ASSIST_REFINE = 'GuildAssistRefine',
}
export const GUILD_REPORT_NUM = 40;

5
shared/consts/constModules/sysConst.ts
View File

@@ -320,8 +320,9 @@ export const FILENAME = {
DIC_MAIL: 'dic_email_army',
DIC_ARMY_TRAIN_JU_DIAN: 'dic_army_trainJuDian',
DIC_ARMY_TRAIN_SOLO_REWARD: 'dic_army_trainSoloReward',
DIC_ARMY_ACTIVE_POINT_WAYS: 'dic_army_activePointWays'
DIC_ARMY_ACTIVE_POINT_WAYS: 'dic_army_activePointWays',
DIC_ARMY_DEVELOPMENTCONSUME: 'dic_army_developmentConsume',
DIC_ARMY_BOSS_RANK_REWARD: 'dic_army_bossrankReward'
}
export const WAR_RELATE_TABLES = [

8
shared/consts/statusCode.ts
View File

@@ -226,8 +226,12 @@ export const STATUS = {
GUILD_GET_TRAIN_REWARD_FAIL: {code: 30913, simStr: '宝箱领取失败'},
GUILD_TRAIN_LEVEL_IS_COMPLETE: {code: 30913, simStr: '试炼已经进阶'},
GUILD_BUY_TRAIN_COUNT_REACH_MAX: { code: 30913, simStr: '训练场购买挑战次数以达到上线' },
GUILD_TRAIN_IS_RESETED: { code: 30913, simStr: '训练场购买挑战次数以达到上线' },
GUILD_TRAIN_IS_RESETED: { code: 30913, simStr: '军团训练场已经重置' },
GUILD_NOT_REFINE_THE_EQUIP: { code: 30913, simStr: '军团不能研发次装备' },
GUILD_LIGHT_UP_THE_SCIENCETREE: { code: 20920, simStr: '军团已经点亮此科技' },
GUILD_SCIENCETREE_IS_RUNNING: { code: 20920, simStr: '军团正在进行研发，不能点亮' },
GUILD_IS_ASSISTED_SCIENCETREE: { code: 20920, simStr: '玩家已经协助过该科技树' },
GUILD_REACH_MAX_ASSIST_COUNT: { code: 20920, simStr: '已经达到协助的最大次数' },
// 社交相关状态 40000 - 49999
// 运营模块相关状态 50000 - 59999
// GM后台相关状态 60000 - 69999

9
shared/db/BossInstance.ts
View File

@@ -11,13 +11,6 @@ class Rank {
time: number;
}
class LastRecord {
@prop({ required: true, default: 0 })
warId: number;
@prop({ required: true})
roleIds: Array<string>;
}
@index({ guildCode: 1 })
export default class BossInstance extends BaseModel {
@prop({ required: true })
@@ -38,7 +31,7 @@ export default class BossInstance extends BaseModel {
@prop({ required: true, default: 0})
num: number;
@prop({ required: true, default:[]})
@prop({ required: true, default:[], type: String, _id: false})
roleIdRecords: Array<string>; //记录提示过胜利boss关的玩家
@prop({ required: true })

2
shared/db/ComBattleTeam.ts
View File

@@ -87,7 +87,7 @@ export default class ComBattleTeam extends BaseModel {
@prop({ required: true })
teamCode: string;
@prop({ required: true, type: String, default: [] })
@prop({ required: true, type: String, default: [], _id: false })
roleIds: Array<string>
// 队伍是否开放加入

30
shared/db/GuildRefine.ts
View File

@@ -1,18 +1,18 @@
import BaseModel from './BaseModel';
import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
class ScienceTree {
export class ScienceTree {
@prop({ required: true })
id: number;
@prop({ required: true })
time: number;
@prop({ required: true })
assistCount: number;
endTime: number;
@prop({ required: true, default: [], type: String, _id: false})
assistRoleIds: Array<string>;
}
@index({ guildCode: 1 })
export default class GuildRefiner extends BaseModel {
export default class GuildRefine extends BaseModel {
@prop({ required: true })
guildCode: string;
@@ -20,13 +20,27 @@ export default class GuildRefiner extends BaseModel {
scienceTrees: ScienceTree[];
public static async createScienceTree(guildCode: string, scienceTrees: ScienceTree[], lean = true) {
const result = await GuildRefinerModel.findOneAndUpdate({ guildCode }, {$set: {scienceTrees}}, {new: true, upsert: true}).lean(lean);
const result = await GuildRefineModel.findOneAndUpdate({ guildCode }, {$set: {scienceTrees}}, {new: true, upsert: true}).lean(lean);
return result;
}
public static async getRefine(guildCode: string, lean = true) {
const result = await GuildRefineModel.findOne({ guildCode }).lean(lean);
return result;
}
public static async pushRefine(guildCode: string, scienceTree: ScienceTree,lean = true) {
const result = await GuildRefineModel.findOneAndUpdate({ guildCode, 'scienceTrees.$.id':{$ne:scienceTree.id}}, {$push: {scienceTrees: scienceTree}}, { new: true }).lean(lean);
return result;
}
public static async updateRefine(guildCode: string, update: GuildRefineTypeParam, lean = true) {
const result = await GuildRefineModel.findOneAndUpdate({ guildCode}, {$set: update}, { new: true }).lean(lean);
return result;
}
}
export const GuildRefinerModel = getModelForClass(GuildRefiner);
export const GuildRefineModel = getModelForClass(GuildRefine)
export interface GuildRefineType extends Pick<DocumentType<GuildRefine>, keyof GuildRefine> { };
export interface GuildRefinerType extends Pick<DocumentType<GuildRefiner>, keyof GuildRefiner>{}
export type GuildRefineTypeParam = Partial<GuildRefineType>; // 将所有字段变成可选项

19
shared/pubUtils/data.ts
View File

@@ -53,7 +53,8 @@ import { dicMail } from "./dictionary/DicMail";
import { dicArmyTrainJuDian } from './dictionary/DicArmyTrainJuDian';
import { dicTrainSoloReward } from './dictionary/DicTrainSoloReward';
import { RewardInter } from "./interface";
import { dicArmyDevelopConsume } from '../pubUtils/dictionary/DicArmyDevelopConsume';
import { dicArmyBossRank } from '../pubUtils/dictionary/DicArmyBossRank';
export const gameData = {
blurprtCompose: dicBlueprtCompose,
blueprtPossibility: dicBlueprtPossibility,
@@ -128,7 +129,9 @@ export const gameData = {
armyTrainJuDian: dicArmyTrainJuDian,
trainSoloReward: dicTrainSoloReward,
mail: dicMail,
guildActiveWays: dicGuildActiveWays
guildActiveWays: dicGuildActiveWays,
armyDevelopConsume: dicArmyDevelopConsume,
armyBossRank: dicArmyBossRank
};
// 在此提供一些原先在gamedata中提供的方法，以便更方便获取gameData数据
@@ -370,3 +373,15 @@ export function getGuildActiveByIdAndType(id: number, type: number) {
if(!dicWay) return 0;
return dicWay.activePoint.get(type.toString());
}
export function getArmyDevelopConsumeById(id: number) {
let result = gameData.armyDevelopConsume.get(id);
return result;
}
export function getArmyDevelopConsume() {
return gameData.armyDevelopConsume;
}
export function getArmyBossRank() {
return gameData.armyBossRank;
}

29
shared/pubUtils/dictionary/DicArmyBossRank.ts Normal file
View File

@@ -0,0 +1,29 @@
import { readJsonFile, parseGoodStr } from '../util'
import { FILENAME } from '../../consts'
type KeysEnum<T> = { [P in keyof Required<T>]: true };
import { RewardInter } from '../interface';
const _ = require('lodash');
export interface DicArmyBossRank {
readonly id: number;
readonly rankMin: number;
readonly rankMax: number;
readonly reward: Array<RewardInter>;
}
const DicArmyBossRankKeys: KeysEnum<DicArmyBossRank> = {
id: true,
rankMin: true,
rankMax: true,
reward: true,
};
const str = readJsonFile(FILENAME.DIC_ARMY_BOSS_RANK_REWARD);
let arr = JSON.parse(str);
export const dicArmyBossRank = new Array<DicArmyBossRank>();
arr.forEach(o => {
o.reward = parseGoodStr(o.reward);
dicArmyBossRank.push(_.pick(o, Object.keys(DicArmyBossRankKeys)));
});
arr = undefined;

43
shared/pubUtils/dictionary/DicArmyDevelopConsume.ts Normal file
View File

@@ -0,0 +1,43 @@
import { readJsonFile, parseGoodStr } from '../util'
import { FILENAME } from '../../consts'
type KeysEnum<T> = { [P in keyof Required<T>]: true };
import { RewardInter } from '../interface';
const _ = require('lodash');
export interface DicArmyDevelopConsume {
readonly id: number;
// 目标品质
readonly quality: number;
readonly levelMin: number;
readonly levelMax: number;
readonly prePositions: Array<number>;
readonly honourConsume: Array<RewardInter>;
readonly fundConsume: number;
readonly timeConsume: number;
}
const DicArmyDevelopConsumeKeys: KeysEnum<DicArmyDevelopConsume> = {
id: true,
quality: true,
levelMin: true,
levelMax: true,
prePositions: true,
honourConsume: true,
fundConsume: true,
timeConsume: true
};
const str = readJsonFile(FILENAME.DIC_ARMY_DEVELOPMENTCONSUME);
let arr = JSON.parse(str);
export const dicArmyDevelopConsume = new Map<number, DicArmyDevelopConsume>();
arr.forEach(o => {
o.honourConsume = parseGoodStr(o.honourConsume);
o.prePositions = o.preposition.split('&').map(element => {
return parseInt(element);
});
dicArmyDevelopConsume.set(o.id,_.pick(o, Object.keys(DicArmyDevelopConsumeKeys)));
});
arr = undefined;