Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix

src/shared/public/hero.ts

@@ -23,6 +23,7 @@ export class HeroShared {
 
         return allBuff;
     }
+
     /**
      * 获取英雄基本属性
      * @param hero 英雄数据
@@ -286,6 +287,7 @@ export class HeroShared {
 
         return buff;
     };
+
     /**修正属性 数值取整*/
     static amendAttr(buff: k_v<number>) {
         for (let k in buff) {
@@ -294,6 +296,7 @@ export class HeroShared {
             buff[k] = Math.floor(buff[k]);
         }
     }
+
     /**
      * 获取英雄战力
      * @param hero 英雄数据
@@ -303,6 +306,7 @@ export class HeroShared {
         let buff = this.getHeroBasicAttr(hero, otherBuff, pos);
         return this.computeHeroZhanLi(buff);
     }
+
     /**
      * 计算英雄战力
      */
@@ -313,6 +317,7 @@ export class HeroShared {
         let def = buff.def || 0;
         let hp = buff.hp || 0;
         let speed = buff.speed || 0;
+        let speedpro = buff.speedpro || 0;
         let hppro = buff.hppro || 0;
         let dpspro = buff.dpspro || 0;
         let undpspro = buff.undpspro || 0;
@@ -329,11 +334,11 @@ export class HeroShared {
             (maxdps * .75) +
             (def * 1.03) +
             (hp * 1) +
-            (speed * 21.28) +
             (hp * hppro * .5) +
+            (speed * (speedpro + 1) * 21.28) +
             ((mindps + maxdps) / 2 * dpspro * .75) +
             (hp * undpspro * .6) +
-            ((mindps + maxdps) / 2 * xixuepro * 1) +
+            ((mindps + maxdps) / 2 * xixuepro) +
             ((mindps + maxdps) / 2 * baoshangpro * .75) +
             ((mindps + maxdps) / 2 * shanbipro * .5) +
             ((mindps + maxdps) / 2 * mingzhongpro * .5) +
@@ -341,6 +346,7 @@ export class HeroShared {
             (hp * pvpdpsdrop * .5)
         );
     }
+
     /**
      * 获取英雄升级消耗
      * @param id 英雄id
@@ -353,6 +359,7 @@ export class HeroShared {
             {a: 'attr', t: 'jinbi', n: G.gc.herolvup[lv].jinbineed}
         ];
     }
+
     /**
      * 获取英雄进阶消耗
      * @param id 英雄id