Merge branch 'feature/hero' of gitlab.trgame.cn:zyztech/zyz_server

Conflicts:
	shared/consts/consts.ts
	shared/db/Role.ts
	web-server/app/service/Auth.ts
This commit is contained in:
luying
2020-12-14 11:17:02 +08:00
57 changed files with 18170 additions and 10511 deletions

View File

@@ -4,6 +4,9 @@
* 属性 id
*/
import { JOB_TYPE } from "./consts";
export enum ABI_TYPE{
/**生命 */
ABI_HP = 1,
@@ -40,15 +43,95 @@ export enum ABI_TYPE{
ABI_BLOOD_SUCK = 16,
/**怒气 */
ABI_AP = 17,
ABI_MAX,
}
export enum SEID_TYPE{
}
export enum SEID_TYPE {
/**属性固定值加成(数值) */
TYPE101 = 101,
/**属性固定值加成(百分比) */
TYPE102 = 102,
}
}
export enum ABI_STAGE {
START = 0,
HP = 1,
ATK = 2,
DEF = 3,
MDEF = 4,
AGI = 5,
LUK = 6,
END = 6
}
export const ATTR = {}
//武将训练等级
export const HEROTARIN = {
1: "hp",
2: "atk",
3: "def",
4: "mdef",
5: "agi",
6: "luk"
};
//战力系数
export const CE_RATIO = {
"hp" : 1,
"atk" : 2,
"matk": 2,
"def": 2,
"mdef": 2,
"agi": 2,
"luk": 0,
"hit": 0,
"cri": 0,
"flee": 0,
"antCri": 0,
"damageIncrease": 0,
"damageDecrease": 0,
"defIngnore": 0,
"bloodSuck": 0,
};
export const HERO_ATTR = {
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" // 怒气
};
export const ABI_TYPE_TO_STAGE = new Map<number, number | ((jobType: number) => number)>([
[ABI_STAGE.HP, ABI_TYPE.ABI_HP],
[ABI_STAGE.ATK, (jobType:number) => { return jobType == JOB_TYPE.PHYSIC?ABI_TYPE.ABI_ATK: ABI_TYPE.ABI_MATK}],
[ABI_STAGE.DEF, ABI_TYPE.ABI_DEF],
[ABI_STAGE.MDEF, ABI_TYPE.ABI_MDEF],
[ABI_STAGE.AGI, ABI_TYPE.ABI_AGI],
[ABI_STAGE.LUK, ABI_TYPE.ABI_LUK]
]);
export function getAtrrNameById(attrId: number) {
return HERO_ATTR[attrId];
};
export function getAttrCeRatio(attr: string) {
return CE_RATIO[attr];
};
export function getAttrNameByJobStage(jobStage: number) {
return HEROTARIN[jobStage];
};

View File

@@ -21,7 +21,12 @@ export const ACTION_POIN = {
MAX: 100000,
PER: 6 * 60 * 1000
};
//武将养成系统分类
export const HERO_SYSTEM_TYPE = {
STAR: 1,
TRAIN: 5,
};
export const BATTLE_REWARD_TYPE = {
FIX_REWARD: 1,
CONDITION_REWARD: 2,
@@ -46,7 +51,9 @@ export const CONSUME_TYPE = {
CONSUME: 1, // 消耗品
SOUL: 2, // 将魂
BLUEPRT: 3, // 藏宝图
POINT: 4 // 远征币等
POINT: 4, // 远征币等
EXP: 5, // 经验书
FAVOUR: 6 // 好感度道具
};
const itid_array = [
@@ -72,6 +79,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 },
@@ -217,29 +226,9 @@ export const EXPEDITION_CONST = {
RESET_CNT: 1 // 可以免费重置的次数
}
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" // 怒气
};
export const EVENT_QUIZ_NUM = 3;
export const DEFAULT_HEROES = [ 312, 314, 311, 309, 315];
export const DEFAULT_HEROES = [ 12, 14, 11, 9, 15];
export const DEFAULT_ITEMS = [
{id: 33106, count: 200},
{id: 33107, count: 200},
@@ -332,4 +321,17 @@ export const FRIEND_DROP_TYPE = {
// 每日情谊点上限
export const FRIEND_DROP_MAX = {
COM_BTL: 150
}
// 武将上限
export const HERO_GROW_MAX = {
STAR: 6,
COLORSTAR: 6,
QUALITY: 3
}
export const JOB_TYPE = {
PHYSIC: 1,
MAGIC: 2
}

View File

@@ -111,7 +111,37 @@ export const STATUS = {
// 秘境 20700 - 20799
DUNGEON_REFRESH_TIMES_LACK: { code: 20701, simStr: '购买次数不足' },
DUNGEON_TIMES_LACK: { code: 20701, simStr: '挑战次数不足' },
// 养成相关状态 30000 - 39999
// 通用 30000 - 30099
ROLE_INFO_NOT_FOUND: { code: 30000, simStr: '数据表未找到' },
ROLE_MATERIAL_NOT_ENOUGH: { code: 30001, simStr: '材料数量不足' },
// 武将养成通用 30100 - 30199
// 武将合成,升级,升星,升品相关 30200 - 30299
ROLE_HERO_EXISTS: {code: 30200, simStr: '已存在武将不可合成' },
ROLE_METERIAL_ERROR: {code: 30201, simStr: '材料错误' },
ROLE_HERO_NOT_EXISTS: {code: 30202, simStr: '未找到该武将' },
ROLE_HERO_LV_OVER: {code: 30203, simStr: '武将等级不可超过主公等级' },
ROLE_HERO_LV_TYPE_ERROR: {code: 30204, simStr: '只可选择升1级或升5级' },
ROLE_EXP_NOT_ENOUGH: {code: 30205, simStr: '材料经验不足' },
ROLE_STAR_STAGE_NOT_ENOUGH: {code: 30206, simStr: '请先点亮前面的星盘' },
ROLE_STAR_REACH_MAX: {code: 30207, simStr: '已升满星,请先觉醒' },
ROLE_STAR_NOT_ENOUGH: {code: 30208, simStr: '未升满星,不可升品' },
ROLE_QUALITY_REACH_MAX: {code: 30209, simStr: '品质已升满' },
ROLE_WAKE_STAR_NOT_ENOUGH: {code: 30210, simStr: '未升满星,不可觉醒' },
ROLE_QUALITY_NOT_ENOUGH: {code: 30211, simStr: '品质未升满,不可觉醒' },
// 武将训练,好感度,羁绊,时装相关 30300 - 30399
HERO_NOT_FIND: {code: 30300, simStr: '武将不存在' },
HERO_JOB_REACH_MAX_STAGE: {code: 30300, simStr: '武将已达到最大的职业阶级'},
HERO_JOB_STAGE_REACH_MAX_STAGE: {code: 30301, simStr: '武将已训练到最大阶段'},
NOT_REACH_UNLOCK_LEVEL: {code: 30302, simStr: '未达到解锁等级'},
HERO_SKIN_NOT_FIND: {code: 30303, simStr: '时装不存在'},
HERO_SKIN_IS_EXIST: {code: 30304, simStr: '时装已存在'},
HERO_CONECTION_IS_MAX_LEVEL: {code: 30306, simStr: '羁绊已达到最大等级'},
HERO_CONECTION_IS_NOT_EXIT: {code: 30307, simStr: '羁绊不存在'},
ROLE_SHORT_HERO_CONECTION:{code: 30308, simStr: '未拥有羁绊武将'},
HERO_FAVOUR_LEVEL_REACH_MAXT:{code: 30308, simStr: '武将好感等级以达到最大'},
// 社交相关状态 40000 - 49999
// 运营模块相关状态 50000 - 59999
// GM后台相关状态 60000 - 69999
@@ -129,4 +159,5 @@ export const STATUS = {
GM_PVP_DEFENSE_NOT_FOUND: { code: 60012, simStr: '该玩家未保存防守阵' },
GM_PVP_DEFENSE_HERO_NOT_FOUND: { code: 60013, simStr: '该守阵没有该武将' },
GM_JSON_FORMAT_ERR: { code: 60005, simStr: 'json格式错误' }
}