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

shared/consts/consts.ts

@@ -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
 }