Merge remote-tracking branch 'origin/dev' into dev

src/api_s2c/event/christmas/fun.ts

@@ -113,7 +113,13 @@ export class Christmasfun {
         mydata.taskval = await this.getTaskVal(call, hdid)
         mydata.refresh = G.time
         mydata.gamenum = 0
-        await this.setMyData(call.uid, hdid, { $set: { refresh: mydata.refresh, taskfinish: mydata.taskfinish, taskval: mydata.taskval, gamenum: mydata.gamenum} })
+        mydata.libao = {}
+        await this.setMyData(call.uid, hdid, { $set: {
+                refresh: mydata.refresh,
+                taskfinish: mydata.taskfinish,
+                taskval: mydata.taskval,
+                gamenum: mydata.gamenum,
+                libao:mydata.libao} })
         return mydata
     }
 

src/api_s2c/hongdian/fun.ts

@@ -725,7 +725,7 @@ export class HuoDongHongDianFun {
         for (let indextask = 0; indextask < Object.keys(_tasks).length; indextask++) {
             const elementtask = Object.keys(_tasks)[indextask];
             let _tmp = _tasks[elementtask];
-            if (_tmp.pval <= (_mydata.taskval[elementtask] || 0) && !_mydata.taskfinsih.includes(elementtask)) {
+            if (_tmp.pval <= (_mydata.taskval[elementtask] || 0) && !_mydata.taskfinish.includes(elementtask)) {
                 // 任务完成且没有领取
                 _res.show = true;
                 return _res;

src/globalListener.ts

@@ -146,6 +146,8 @@ export type gEventType = {
     Class_task_155: (eventname, call, val, chkVal) => void;
     /**每日钻石消耗 */
     Class_task_156: (eventname, call, val, chkVal) => void;
+    /**每日获取vip经验 */
+    Class_task_157: (eventname, call, val, chkVal) => void;
 };
 
 export function addListener() {

src/public/player.ts

@@ -178,6 +178,10 @@ export class PlayerFun {
                         G.emit("Class_task_156", 'Class_task_156', call, -atn.n, 0);
                     }
                 }
+                // 增加vip经验的任务监听
+                if (atn.t == "payExp" && atn.n > 0) {
+                    G.emit("Class_task_157", 'Class_task_157', call, atn.n, 0);
+                }
                 all.push(this.changeAttr(call.conn.uid, change));
                 all.push(this.upAttr(call, {...atn, n: change[atn.t]}));
                 //await this.changeAttr(call.conn.uid, change);

src/public/taskclass.ts

@@ -793,6 +793,15 @@ export module manager {
             return 1;
         }
     }
+    // 第59个任务 获得vip经验
+    export class Class_task_157 extends BaseClass {
+        stype = 157
+        isinc = 1
+
+        async initVal(call: ApiCall, con) {
+            return 0;
+        }
+    }
 
 }