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

远征本主界面及匹配机器人

Browse Source
This commit is contained in:
luying
2020-10-13 19:16:58 +08:00
parent 682e95561d
commit 7652f63414
15 changed files with 568 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/consts/consts.ts
+21
View File
@@ -67,3 +67,24 @@ export const HANG_UP_CONSTS = {
UNIT_TIME: 10 * 60 * 1000,
MAX_TIME: 12 * 60 * 60 * 1000
}
export const WAR_JSON_ATTRIBUTE_TYPE = {
"1": "hp", // 生命
"2": "atk", // 物攻
"3": "matk", // 策攻
"4": "def", // 物防
"5": "mdef", // 测防
"6": "agi", // 敏捷
"7": "luk", // 幸运
"8": "speed", // 移动
"9": "hit", // 命中等级
"10": "cri", // 暴击等级
"11": "flee", // 格挡等级
"12": "antCri", // 抗暴等级
"13": "damageIncrease", // 伤害加深等级
"14": "damageDecrease", // 伤害减免等级
"15": "defIngnore", // 忽视防御等级
"16": "bloodSuck", // 吸血等级
"17": "ap" // 怒气
};
shared/db/ExpeditionPoint.ts
+27
View File
@@ -0,0 +1,27 @@
import BaseModel from './BaseModel';
import { index, getModelForClass, prop } from '@typegoose/typegoose';
/**
* 远征记录
*/
@index({ roleId: 1, eventId: 1 })
@index({ roleId: 1, eventCode: 1 })
export default class ExpeditionPoint extends BaseModel {
@prop({ required: true })
roleId: string; // 角色 id
@prop({ required: true })
pointCost: number; // 消耗点数
@prop({ required: true })
completed: boolean; // 本轮奖励是否完成
@prop({ required: true, default: [] })
rewards: Array<{point: number, reward: string, received:boolean, recTime: Date}>; // 领取记录
public static async getExpeditionPoint(roleId: string, lean = true) {
const result = await ExpeditionPointModel.findOne({ roleId, completed: false }).lean(lean);
return result;
}
}
export const ExpeditionPointModel = getModelForClass(ExpeditionPoint);
shared/db/ExpeditionRecord.ts
+34
View File
@@ -0,0 +1,34 @@
import BaseModel from './BaseModel';
import { index, getModelForClass, prop } from '@typegoose/typegoose';
/**
* 远征记录
*/
@index({ roleId: 1, eventId: 1 })
@index({ roleId: 1, eventCode: 1 })
export default class ExpeditionRecord extends BaseModel {
@prop({ required: true })
roleId: string; // 角色 id
@prop({ required: true })
roleName: string; // 角色 名
@prop({ required: true })
expeditionCode: string; // 远征的唯一标识
@prop({ required: true })
time: number; // 时间
@prop({ required: true })
heroes: Array<{hid: number, hp: number, cp: number}>; // 我方已出场武将
public static async getTodayRecord(roleId: string, time: number, lean = true) {
const role = await ExpeditionRecordModel.findOne({ roleId, time }).lean(lean);
return role;
}
public static async createTodayRecord(expeditionCode: string, params: { roleId: string, roleName: string, time: number, heroes: Array<{hid: number, hp: number, cp: number}> }, lean = true) {
const role = await ExpeditionRecordModel.findOneAndUpdate({ expeditionCode }, params, { new: true, upsert: true }).lean(lean);
return role;
}
}
export const ExpeditionRecordModel = getModelForClass(ExpeditionRecord);
shared/db/ExpeditionWarRecord.ts
+52
View File
@@ -0,0 +1,52 @@
import BaseModel from './BaseModel';
import { index, getModelForClass, prop } from '@typegoose/typegoose';
/**
* 远征记录
*/
@index({ expeditionCode: 1, expeditionId: 1 })
export default class ExpeditionWarRecord extends BaseModel {
@prop({ required: true, default: '' })
roleId: string; // 角色 id
@prop({ required: true, default: '' })
expeditionCode: string; // 远征的唯一标识
@prop({ required: true, default: 0 })
expeditionId: number; // 远征序号
@prop({ required: true, default: 0 })
battleId: number; // 相关关卡id
@prop({ required: true, default: '' })
battleCode: string; // 关联关卡唯一值
@prop({ required: true, default: 0 })
battleStatus: number; // 是否通过
@prop({ required: true, default: false })
received: boolean; // 本关战胜后宝箱是否领取
@prop({ required: true, default: false })
reward: string; // 领取的宝箱奖励
@prop({ required: true, default: 0 })
enemyFrom: number; // 敌军数据来源：1-配表的敌军队，2-玩家
@prop({ required: true, default: '' })
enemyId: string; // 敌军队伍id或玩家id
@prop({ required: true, default: [] })
enemies: Array<any>; // 敌军数据
public static async getRecordByCode(expeditionCode: string, lean = true) {
const result = await ExpeditionWarRecordModel.find({ expeditionCode }).select('expeditionId battleId battleCode battleStatus received').sort({expeditionId: 1}).lean(lean);
return result;
}
public static async getRecordByCodeAndId(expeditionCode: string, expeditionId: number, lean = true) {
const result = await ExpeditionWarRecordModel.findOne({ expeditionCode, expeditionId }).select('expeditionId battleId battleCode battleStatus received enemyFrom enemies').lean(lean);
return result;
}
public static async saveRecord(expeditionCode: string, expeditionId: number, params: {roleId: string, battleId: number, enemyFrom: number, enemyId: string, enemies: Array<any>}, lean = true) {
const doc = new ExpeditionWarRecordModel();
const update = Object.assign(doc.toJSON(), params, {expeditionCode, expeditionId});
const result = await ExpeditionWarRecordModel.findOneAndUpdate({ expeditionCode, expeditionId }, update, {new: true, upsert: true}).select('expeditionId battleId battleCode battleStatus received enemyFrom enemies').lean(lean);
return result;
}
}
export const ExpeditionWarRecordModel = getModelForClass(ExpeditionWarRecord);
shared/db/Hero.ts
+18 -1
View File
@@ -68,13 +68,30 @@ export default class Hero extends BaseModel {
return hero;
}
public static async createHero(heroInfo: {roleId: string, roleName: string, hid: number, hName: string, seqId: number, lv?:number}, lean = true) {
public static async createHero(heroInfo: {roleId: string, roleName: string, hid: number, hName: string, seqId: number, lv?:number, ce: number}, lean = true) {
const doc = new HeroModel();
const update = Object.assign(doc.toJSON(), heroInfo);
const hero = await HeroModel.findOneAndUpdate({roleId: heroInfo.roleId, hid: heroInfo.hid}, update, {upsert: true, new: true}).lean(lean);
return hero;
}
public static async sumTopHeroCe(roleId: string, num: number) {
let ce = await HeroModel.aggregate([
{ $match : { roleId } },
{ $sort: {ce: -1} },
{ $limit: num },
{ $group: { _id: null, ce: { $sum: '$ce' } } }
]);
return ce[0].ce;
}
public static async sumHeroCe(roleId: string) {
let ce = await HeroModel.aggregate([
{ $match : { roleId } },
{ $group: { _id: null, ce: { $sum: '$ce' } } }
]);
return ce[0].ce;
}
}
export const HeroModel = getModelForClass(Hero);
shared/db/Role.ts
+4
View File
@@ -99,6 +99,10 @@ export default class Role extends BaseModel {
// @prop({ required: false })
// hangUpTime: Date; // 当前挂机开始时间
@prop({ required: true })
expeditionPoint: number; // 远征点数
public static async findByUid(uid: number, serverId: number, lean = true) {
const role = await RoleModel.findOne({ 'userInfo.uid': uid, serverId }).lean(lean);
shared/resource/jsons/dic_expedition.json
+101 -1
View File
@@ -1 +1,101 @@
[{"id":"远征本身的序号","warId":"对应远征关卡表的id","reward":"战斗后可得的宝箱（id&count|id&count）","CEScale":"战力系数比，1 为玩家基础战力","CERange":"步长，敌军战力系数范围，单位%：[CEScale - CERange, CEScale + CERange]","CEScaleNew":"新手期战力系数比","CERangeNew":"新手期步长，单位%","json":"对应的出兵表，默认和warId一致，但支持填多个表id，如果填了多个就在其中随机一个，用&连接","ce":"标准战力，用于计算玩家和机器人战力比"},{"id":1,"warId":4001,"reward":"&","CEScale":0.5,"CERange":5,"CEScaleNew":0.3,"CERangeNew":5,"json":4001,"ce":10000},{"id":2,"warId":4002,"reward":"&","CEScale":0.6,"CERange":5,"CEScaleNew":0.35,"CERangeNew":5,"json":4002,"ce":10000},{"id":3,"warId":4003,"reward":"&","CEScale":0.7,"CERange":5,"CEScaleNew":0.4,"CERangeNew":5,"json":4003,"ce":10000},{"id":4,"warId":4004,"reward":"&","CEScale":0.8,"CERange":5,"CEScaleNew":0.45,"CERangeNew":5,"json":4004,"ce":10000},{"id":5,"warId":4005,"reward":"&","CEScale":1,"CERange":5,"CEScaleNew":0.5,"CERangeNew":5,"json":4005,"ce":10000},{"id":6,"warId":4006,"reward":"&","CEScale":1.05,"CERange":5,"CEScaleNew":0.55,"CERangeNew":5,"json":4006,"ce":10000},{"id":7,"warId":4007,"reward":"&","CEScale":1.1,"CERange":5,"CEScaleNew":0.6,"CERangeNew":5,"json":4007,"ce":10000},{"id":8,"warId":4008,"reward":"&","CEScale":1.15,"CERange":5,"CEScaleNew":0.7,"CERangeNew":5,"json":4008,"ce":10000},{"id":9,"warId":4009,"reward":"&","CEScale":1.3,"CERange":5,"CEScaleNew":0.8,"CERangeNew":5,"json":4009,"ce":10000}]
[
{
"id": 1,
"warId": 4001,
"reward": "&",
"CEScale": 0.5,
"CERange": 5,
"CEScaleNew": 0.3,
"CERangeNew": 5,
"json": 4001,
"ce": 10000
},
{
"id": 2,
"warId": 4002,
"reward": "&",
"CEScale": 0.6,
"CERange": 5,
"CEScaleNew": 0.35,
"CERangeNew": 5,
"json": 4002,
"ce": 10000
},
{
"id": 3,
"warId": 4003,
"reward": "&",
"CEScale": 0.7,
"CERange": 5,
"CEScaleNew": 0.4,
"CERangeNew": 5,
"json": 4003,
"ce": 10000
},
{
"id": 4,
"warId": 4004,
"reward": "&",
"CEScale": 0.8,
"CERange": 5,
"CEScaleNew": 0.45,
"CERangeNew": 5,
"json": 4004,
"ce": 10000
},
{
"id": 5,
"warId": 4005,
"reward": "&",
"CEScale": 1,
"CERange": 5,
"CEScaleNew": 0.5,
"CERangeNew": 5,
"json": 4005,
"ce": 10000
},
{
"id": 6,
"warId": 4006,
"reward": "&",
"CEScale": 1.05,
"CERange": 5,
"CEScaleNew": 0.55,
"CERangeNew": 5,
"json": 4006,
"ce": 10000
},
{
"id": 7,
"warId": 4007,
"reward": "&",
"CEScale": 1.1,
"CERange": 5,
"CEScaleNew": 0.6,
"CERangeNew": 5,
"json": 4007,
"ce": 10000
},
{
"id": 8,
"warId": 4008,
"reward": "&",
"CEScale": 1.15,
"CERange": 5,
"CEScaleNew": 0.7,
"CERangeNew": 5,
"json": 4008,
"ce": 10000
},
{
"id": 9,
"warId": 4009,
"reward": "&",
"CEScale": 1.3,
"CERange": 5,
"CEScaleNew": 0.8,
"CERangeNew": 5,
"json": 4009,
"ce": 10000
}
]
shared/resource/jsons/dic_expedition_point.json
+1 -1
View File
@@ -1 +1 @@
[{"point":"点数","reward":"宝箱奖励（id&count|id&count）","__EMPTY":0,"__EMPTY_1":0},{"point":6,"reward":"&","__EMPTY":0,"__EMPTY_1":0},{"point":12,"reward":"&","__EMPTY":0,"__EMPTY_1":0},{"point":18,"reward":"&","__EMPTY":0,"__EMPTY_1":0}]
[{"point":6,"reward":"&"},{"point":12,"reward":"&"},{"point":18,"reward":"&"}]
shared/resource/jsons/dic_zyz_gk_expedition.json
+28
View File
@@ -0,0 +1,28 @@
[
{
"war_id": 4001,
"dispatchJsonId": 101,
"bg_img_id": 101,
"script_id": 101,
"fixReward": "&",
"conditionReward": "&",
"RandomReward": "&",
"warType": 1,
"gk_name": "序章&王越童渊比试",
"kingExp": 100,
"lvLimted": 1,
"turnLimted": 20,
"forcedCharactor": "&",
"fobiddenCharactor": "&",
"victoryInfoInUI": "无",
"loseInfoInUI": "无",
"starInfoInUI": "无",
"cost": 2,
"iconInMap": "&",
"sSpineInUI": "&",
"detailUIBg": 0,
"recommendedPower": 10003,
"previousGk": 0,
"relatedEliteGk": 0
}
]
shared/resource/warJsons/4001.json
+6 -6
View File
@@ -1,5 +1,5 @@
[{
"warId": 1502,
"warId": 4001,
"actorName": "李典",
"actorId": 312,
"dataId": 2001,
@@ -13,13 +13,13 @@
"hide": 0,
"initial_ai": 1,
"bossid": 0,
"attribute": "&",
"attribute": "1&1000|2&2000|3&3000",
"skill": "&",
"seid": "&",
"star": 0,
"spine": 0
}, {
"warId": 1502,
"warId": 4001,
"actorName": "吕布",
"actorId": 344,
"dataId": 2002,
@@ -39,7 +39,7 @@
"star": 0,
"spine": 0
}, {
"warId": 1502,
"warId": 4001,
"actorName": "贾诩",
"actorId": 314,
"dataId": 2003,
@@ -59,7 +59,7 @@
"star": 0,
"spine": 0
}, {
"warId": 1502,
"warId": 4001,
"actorName": "许褚",
"actorId": 315,
"dataId": 2004,
@@ -79,7 +79,7 @@
"star": 0,
"spine": 0
}, {
"warId": 1502,
"warId": 4001,
"actorName": "邓艾",
"actorId": 309,
"dataId": 2005,