Merge branch 'feature/equip'

shared/pubUtils/playerCe.ts

@@ -71,6 +71,7 @@ export async function reCalAllHeroCe(type: number, roleId: string, update: RoleU
     let pushHeros = new Array<{ hid: number, ce: number, incHeroCe: number }>();
 
     let allIncCe = 0;
+    let resultHeroes = [];
     for (let hero of heros) {
         let { attr: heroAttrs, lv } = hero;
         let newAttr = new AttributeCal();
@@ -81,8 +82,11 @@ export async function reCalAllHeroCe(type: number, roleId: string, update: RoleU
             let incHeroCe = heroCe - hero.ce;
             allIncCe += incHeroCe;
             pushHeros.push({ hid: hero.hid, ce: reduceCe(heroCe), incHeroCe: reduceCe(incHeroCe) });
-            await HeroModel.updateHeroInfo(roleId, hero.hid, { ce: heroCe });   
+            let resultHero = await HeroModel.updateHeroInfo(roleId, hero.hid, { ce: heroCe });   
+            resultHeroes.push(resultHero);
             await PvpDefenseModel.updateCe(roleId, hero.hid, reduceCe(incHeroCe)); // 更新pvp防守阵战力
+        } else {
+            resultHeroes.push(hero);
         }
 
     }
@@ -100,7 +104,7 @@ export async function reCalAllHeroCe(type: number, roleId: string, update: RoleU
     let guild = await GuildModel.updateCe(roleId, allIncCe); // 公会更新战力
 
     saveCeChangeLog(role, allIncCe, role.ce, type, args);
-    return { role, pushHeros, ce: role.ce, topLineupCe: role.topLineupCe, guild, serverId: role.serverId, heros }
+    return { role, pushHeros, ce: role.ce, topLineupCe: role.topLineupCe, guild, serverId: role.serverId, heros: resultHeroes }
 
 }
 

shared/resource/jsons/dic_army_developmentConsume.json

@@ -19,7 +19,7 @@
         "max": 2,
         "honourConsume": "40005&60",
         "fundConsume": 19000,
-        "timeConsume": 1200
+        "timeConsume": 20
     },
     {
         "id": 3,
@@ -30,7 +30,7 @@
         "max": 3,
         "honourConsume": "40005&50",
         "fundConsume": 27000,
-        "timeConsume": 1800
+        "timeConsume": 30
     },
     {
         "id": 4,
@@ -41,7 +41,7 @@
         "max": 1,
         "honourConsume": "40005&70",
         "fundConsume": 40000,
-        "timeConsume": 2700
+        "timeConsume": 40
     },
     {
         "id": 5,
@@ -52,7 +52,7 @@
         "max": 2,
         "honourConsume": "40005&60",
         "fundConsume": 40000,
-        "timeConsume": 2700
+        "timeConsume": 50
     },
     {
         "id": 6,
@@ -63,7 +63,7 @@
         "max": 3,
         "honourConsume": "40005&50",
         "fundConsume": 31000,
-        "timeConsume": 2700
+        "timeConsume": 60
     },
     {
         "id": 7,
@@ -74,7 +74,7 @@
         "max": 1,
         "honourConsume": "40005&70",
         "fundConsume": 45000,
-        "timeConsume": 4800
+        "timeConsume": 70
     },
     {
         "id": 8,
@@ -85,7 +85,7 @@
         "max": 2,
         "honourConsume": "40005&60",
         "fundConsume": 60000,
-        "timeConsume": 7200
+        "timeConsume": 80
     },
     {
         "id": 9,
@@ -96,7 +96,7 @@
         "max": 3,
         "honourConsume": "40005&50",
         "fundConsume": 40000,
-        "timeConsume": 2700
+        "timeConsume": 90
     },
     {
         "id": 10,
@@ -107,7 +107,7 @@
         "max": 1,
         "honourConsume": "40005&70",
         "fundConsume": 48000,
-        "timeConsume": 5400
+        "timeConsume": 100
     },
     {
         "id": 11,
@@ -118,7 +118,7 @@
         "max": 2,
         "honourConsume": "40005&60",
         "fundConsume": 66000,
-        "timeConsume": 8400
+        "timeConsume": 110
     },
     {
         "id": 12,
@@ -129,7 +129,7 @@
         "max": 3,
         "honourConsume": "40005&50",
         "fundConsume": 86000,
-        "timeConsume": 10800
+        "timeConsume": 120
     },
     {
         "id": 13,
@@ -140,7 +140,7 @@
         "max": 1,
         "honourConsume": "40005&70",
         "fundConsume": 40000,
-        "timeConsume": 2700
+        "timeConsume": 130
     },
     {
         "id": 14,
@@ -151,7 +151,7 @@
         "max": 2,
         "honourConsume": "40005&60",
         "fundConsume": 84000,
-        "timeConsume": 10800
+        "timeConsume": 140
     },
     {
         "id": 15,
@@ -162,6 +162,6 @@
         "max": 3,
         "honourConsume": "40005&50",
         "fundConsume": 115000,
-        "timeConsume": 16800
+        "timeConsume": 150
     }
 ]

shared/resource/jsons/dic_zyz_shoptype.json

@@ -37,22 +37,22 @@
     },
     {
         "typeid": 11,
-        "name": "二星套装"
+        "name": "蓝品图纸"
     },
     {
         "typeid": 12,
-        "name": "三星套装"
+        "name": "紫品图纸"
     },
     {
         "typeid": 13,
-        "name": "四星套装"
+        "name": "橙品图纸"
     },
     {
         "typeid": 14,
-        "name": "五星套装"
+        "name": "红品图纸"
     },
     {
         "typeid": 15,
-        "name": "六星套装"
+        "name": "金品图纸"
     }
 ]