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

src/api_s2c/event/christmas/ApiQianDao.ts

@@ -19,17 +19,23 @@ export default async function (call: ApiCall<ReqQianDao, ResQianDao>) {
         _mydata.qiandao.push(i)
         _prize = _prize.concat(_con[i])
     }
-
     if (!_prize){
         // 没有奖励可以领取
         return call.error('', { code: -1, message: globalThis.lng.yangchengmubiao_2 })
     }
-
-
     let _setData = {}
+    let _addVal = 0
+    // 懒得喊后台和前端修改了，直接取prize里面的对应的经验字段去添加zhanling经验
+     for (const p of _prize) {
+         // 战令经验
+         if (p.t == "shengdanExp") {
+             _addVal += p.n
+         }
+     }
+    _mydata["val"] += _addVal
+    _setData["val"] = _mydata.val
     _setData["qiandao"] = _mydata.qiandao
     await Christmasfun.setMyData(call.uid, call.req.hdid, { $set: _setData })
-
     await PlayerFun.sendPrize(call, _prize);
     let changedata = { mydata: _mydata, prize: _prize}
     // 推送红点

src/api_s2c/hongdian/fun.ts

@@ -361,7 +361,10 @@ export class HuoDongHongDianFun {
                 // 检测 htype 6 七日登录活动红点
                 ishd = await this.qiridengluHongDian(call, element)
             }
-
+            if (element.htype == 8) {
+                // 检测 htype 8 圣诞活动红点
+                ishd = await this.christmasHongDian(call, element)
+            }
             if (element.htype == 10) {
                 // 检测 htype 10 破冰活动红点
                 ishd = await this.pobinglibao(call, element)

src/globalListener.ts

@@ -144,6 +144,8 @@ export type gEventType = {
     Class_task_154: (eventname, call, val, chkVal) => void;
     /**每日任务宝箱领取 */
     Class_task_155: (eventname, call, val, chkVal) => void;
+    /**每日钻石消耗 */
+    Class_task_156: (eventname, call, val, chkVal) => void;
 };
 
 export function addListener() {

src/public/player.ts

@@ -172,6 +172,11 @@ export class PlayerFun {
                 change[atn.t] = this.fixAttrLteZero(atn.t, await this.getAtnNum(call, atn) + atn.n);
                 if (atn.t == 'rmbmoney') {
                     this.changeAttrLog(call.conn.uid, change[atn.t], atn, call.conn.gud.rmbmoney)
+                    // 扣除钻石时
+                    if (atn.n < 0) {
+                        // 监听任务消耗任务
+                        G.emit("Class_task_156", 'Class_task_156', call, -atn.n, 0);
+                    }
                 }
                 all.push(this.changeAttr(call.conn.uid, change));
                 all.push(this.upAttr(call, {...atn, n: change[atn.t]}));

src/public/taskclass.ts

@@ -772,7 +772,7 @@ export module manager {
         isinc = 1
 
         async initVal(call: ApiCall, con) {
-            return 1;
+            return 0;
         }
     }
     // 第57个任务 领取每日任务最终宝箱
@@ -780,6 +780,15 @@ export module manager {
         stype = 155
         isinc = 0
 
+        async initVal(call: ApiCall, con) {
+            return 0;
+        }
+    }
+    // 第58个任务 每日钻石消耗
+    export class Class_task_156 extends BaseClass {
+        stype = 156
+        isinc = 1
+
         async initVal(call: ApiCall, con) {
             return 1;
         }