升级，升星，升品，升彩星

shared/consts/abilityConst.ts

@@ -53,10 +53,12 @@ export enum ABI_TYPE{
   }
   
   export enum ABI_STAGE {
+    START = 0,
     HP = 1,
     ATK = 2,
     DEF = 3,
     MDEF = 4,
     AGI = 5,
-    LUK = 6
+    LUK = 6,
+    END = 6
   }

shared/consts/consts.ts

@@ -326,4 +326,12 @@ export const FRIEND_DROP_TYPE = {
 // 每日情谊点上限
 export const FRIEND_DROP_MAX = {
   COM_BTL: 150
+}
+
+
+// 武将上限
+export const HERO_GROW_MAX = {
+  STAR: 6,
+  COLORSTAR: 6,
+  QUALITY: 3
 }

shared/consts/statusCode.ts

@@ -121,6 +121,17 @@ export const STATUS = {
     // 武将合成，升级，升星，升品相关 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
     
     // 社交相关状态 40000 - 49999

shared/db/Hero.ts

@@ -1,6 +1,8 @@
 import BaseModel from './BaseModel';
 import { index, getModelForClass, prop, Ref, mongoose } from '@typegoose/typegoose';
 import Equip from './Equip';
+import { CounterModel } from './Counter';
+import { COUNTER } from '../consts/consts';
 
 /**
   * 英雄表
@@ -12,7 +14,7 @@ interface heroUpdate {
     star?: number;						
     starStage?: number;		 
     colorStar?: number;
-    fireStage?: number;
+    colorStarStage?: number;
     quality?: number;
     job?:number;
     jobStage?:number;
@@ -63,7 +65,7 @@ export default class Hero extends BaseModel {
     @prop({ required: true, default: 0 })
     colorStar: number;						// 觉醒， 彩星
     @prop({ required: true, default: 0 })
-    fireStage: number;			// 觉醒六维阶段
+    colorStarStage: number;			// 觉醒六维阶段
     
     @prop({ required: true, default: 0 })
     quality: number;			  // 品质
@@ -120,9 +122,10 @@ export default class Hero extends BaseModel {
 
     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);
+        const seqId = await CounterModel.getNewCounter(COUNTER.HID)||-1;
+        const update = Object.assign(doc.toJSON(), heroInfo, {seqId});
         delete update._id;
-        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);
+        const hero = await HeroModel.findOneAndUpdate({roleId: heroInfo.roleId, hid: heroInfo.hid}, update, {upsert: true, new: true}).select('hid hName lv exp star starStage colorStar colorStarStage quality job jobStage connections favour favourLv skins equips').lean(lean);
         return hero;
     }
 

shared/pubUtils/gamedata.ts

@@ -13,6 +13,7 @@ const heroInfos = new Map<number, any>();
 const jobInfos = new Map<number, any>();
 const jobClassMaxGrades = new Map<number, number>();
 const levelInfos = new Map<number, {sum: number, cur: number}>();
+const heroLevelInfo = new Map<number, number>();
 const starRatioInfo = new Map<number, number>();
 const heroSkillInfo = new Map<number, any>()
 const seidInfo = new Map<number, any>();
@@ -118,6 +119,16 @@ function parseLevelInfo() {
     });
 }
 
+function parseHeroLevelInfo() {
+    const jobFile = 'dic_zyz_charexp';
+    const levelData = gamedata['jsons'][jobFile] || [];
+    levelData.forEach(elem => {
+        if (elem && elem.level) {
+            heroLevelInfo.set(elem.level, elem.exp);
+        }
+    });
+}
+
 function parseStarRatio() {
     const file = 'dic_star_ratio';
     const data = gamedata['jsons'][file] || [];
@@ -256,6 +267,7 @@ function parseData() {
     parseHeroData();
     parseJobData();
     parseLevelInfo();
+    parseHeroLevelInfo();
     parseStarRatio();
     parseHeroSkill();
     parseSeidList();
@@ -336,6 +348,10 @@ export function getExpByLv(lv: number) {
     return levelInfos.get(lv);
 }
 
+export function getHeroExpByLv(lv: number) {
+    return heroLevelInfo.get(lv);
+}
+
 export function getStarRatio(star: number) {
     return starRatioInfo.get(star);
 }

shared/pubUtils/util.ts

@@ -104,6 +104,12 @@ const moment = require('moment');
           result = { id: parseInt(id), weight: parseInt(weight) };
           break;
         }
+        case 'cost': {
+          let [id, count] = arr;
+          if(isNaN(id) || isNaN(count)) throw new Error('data table format wrong');
+          result = { id: parseInt(id), count: parseInt(count)};
+          break;
+        }
       }
       return result;
     };

shared/resource/jsons/dic_zyz_hero_quality_up.json

@@ -3,18 +3,18 @@
         "id": 1,
         "quality": 1,
         "fragmentNum": 100,
-        "consume": "100&100&100"
+        "consume": "&"
     },
     {
         "id": 2,
         "quality": 2,
         "fragmentNum": 200,
-        "consume": "100&100&100"
+        "consume": "&"
     },
     {
         "id": 3,
         "quality": 3,
         "fragmentNum": 300,
-        "consume": "100&100&100"
+        "consume": "&"
     }
 ]

shared/resource/jsons/dic_zyz_hero_wake.json

@@ -4,7 +4,7 @@
         "quality": 1,
         "star": 0,
         "fragmentNum": 240,
-        "consume": "20000&100|20001&100",
+        "consume": "&",
         "hp_up": 21,
         "atk_up": 22,
         "def_up": 23,