Merge branch 'bugfix' into dev

src/api_s2c/user/ApiPing.ts

@@ -20,4 +20,9 @@ export default async function (call: ApiCall<ReqPing, ResPing>) {
         onlineTime: onlineTime,
         openDay: PublicShared.getOpenServerDay()
     });
+
+    G.server.sendMsgByUid(call.uid, 'msg_s2c/PlayerChange', {
+        jinbi: call.conn.gud.jinbi,
+        rmbmoney: call.conn.gud.rmbmoney
+    });
 }

src/globalListener.ts

@@ -149,6 +149,8 @@ export type gEventType = {
     Class_task_156: (eventname, call, val, chkVal) => void;
     /**每日获取vip经验 */
     Class_task_157: (eventname, call, val, chkVal) => void;
+    /**今日参与{1}次抓娃娃小游戏 */
+    Class_task_158: (eventname, call, val, chkVal) => void;
 };
 
 export function addListener() {

src/public/task.ts

@@ -838,6 +838,12 @@ export class TaskAllEmitFun {
             G.emit("Class_task_153", 'Class_task_153', node.call, _val, 0);
         }
 
+        if (node.call.service.name == 'event/yuandan/DMRec' && node.return.isSucc) {
+            // 今日参与{1}次抓娃娃小游戏
+            let _val = node.call.conn.gud.helpHeros.length;
+            G.emit("Class_task_158", 'Class_task_158', node.call, _val, 0);
+        }
+
 
         if (node.call.eventMsg && node.call.eventMsg["msg_s2c/PeijianChange"] && node.call.eventMsg["msg_s2c/PeijianChange"]) {
             let _change = node.call.eventMsg["msg_s2c/PeijianChange"];

src/public/taskclass.ts

@@ -823,6 +823,16 @@ export module manager {
         }
     }
 
+    // 第60个任务 今日参与{1}次抓娃娃小游戏
+    export class Class_task_158 extends BaseClass {
+        stype = 158
+        isinc = 1
+
+        async initVal(call: ApiCall, con) {
+            return 0;
+        }
+    }
+
 }
 
 

src/shared/public/hero.ts

@@ -141,6 +141,8 @@ export class HeroShared {
                 }
             });
 
+            let sumLv = R.sum(pjs.map(i => i.lv))
+
             for (let [suitId, data] of Object.entries(suitObj)) {
 
                 // //计算配件套装属性
@@ -149,7 +151,7 @@ export class HeroShared {
                 // suitBuff.forEach(b => PublicShared.mergeProperty(buff, b[1]));
 
                 //计算配件大师属性
-                let masterConf = Object.values(G.gc.peijian_master[suitId]).filter(c => c.lv <= data.minLv).sort((a, b) => b.lv - a.lv)[0];
+                let masterConf = Object.values(G.gc.peijian_master[suitId]).filter(c => c.needLv <= sumLv).sort((a, b) => b.lv - a.lv)[0];
                 if (masterConf) {
                     let masterbuff = Object.entries(masterConf.buff).filter(v => Number(v[0]) <= data.num);
                     masterbuff.forEach(b => PublicShared.mergeProperty(buff, b[1]));
@@ -280,6 +282,7 @@ export class HeroShared {
             let buffKey = k.replace('pro', '');
             if (buff[buffKey]) {
                 buff[buffKey] += buff[buffKey] * buff[k];
+                if (buffKey == 'baoshang' && buff[buffKey] > 10) buff[buffKey] = 10
                 // buff[k] = 0;
             }
         }