Merge remote-tracking branch 'origin/bugfix' into release

# Conflicts:
#	src/public/fight.ts
#	src/public/player.ts
#	zoeninfo.sh

src/api_s2c/event/chuanshuozhilu/ApiOpen.ts

@@ -12,11 +12,38 @@ export default async function (call: ApiCall<ReqOpen, ResOpen>) {
         // 无此活动
         return call.error('', { code: -1, message: globalThis.lng.huodong_open_1 })
     }
-
     let db = await G.mongodb.cEvent(`chuanshuozhilu${call.req.hdid}`).findOne({ uid: call.uid, type: `chuanshuozhilu${call.req.hdid}` });
+    let _info = db?.info || {}
+    // 如果初始没有数据，就判断玩家是否有活动对应的影响，生成一下初始化数据
+    if (!db) {
+
+        let _dbType: `chuanshuozhilu${number}` = `chuanshuozhilu${call.req.hdid}`
+        const hid = _hdinfo.data.hid
+        let heros = await G.mongodb.collection("hero").find({uid: call.uid, heroId: hid})
+            .sort({ "zhanli": -1 }).limit(1).toArray();
+
+        if (heros) {
+           let hero = heros[0]
+           const lv = hero.lv || 0
+           const jieji = hero.jieji || 0
+           let setInfo = {"lv": lv, "jieji": jieji}
+           await G.mongodb.cEvent(_dbType).updateOne(
+                    { uid: call.uid, type: _dbType },
+                    { $set: G.mongodb.createTreeObj({ key: `info.${hid}`, val: setInfo})},
+                    { upsert: true}
+                )
+           if (!cache[call.uid]) cache[call.uid] = {hid:{}};
+           if (!cache[call.uid][hid]) cache[call.uid][hid] = setInfo;
+           _info[hid] = setInfo
+
+           G.server.sendMsgByUid(call.uid, 'msg_s2c/HongDianChange', ['huodonghd']);
+      }
+
+    }
+
 
     call.succ({
-        info: db?.info || {},
+        info: _info,
         hdinfo: _hdinfo
     });
 }

src/api_s2c/event/yangchengmubiao/ApiRec.ts

@@ -35,6 +35,7 @@ export default async function (call: ApiCall<ReqRec, ResRec>) {
         _mydata.lunci += 1
         _setData["taskval"] = _mydata.taskval
         _setData["lunci"] = _mydata.lunci
+        _setData["finishid"] = _mydata.finishid
     }
 
     // 设置任务改变数据

src/api_s2c/event/yuedujijin/ApiRec.ts

@@ -16,8 +16,8 @@ export default async function (call: ApiCall<ReqRec, ResRec>) {
     if (call.req.index > day) return call.errorCode(-3);
     if (rec.includes(call.req.index)) return call.errorCode(-4);
 
-
-    G.mongodb.cEvent(type).updateOne({uid: call.uid, type: type}, {$push: {rec: call.req.index}}, {upsert: true});
+    // 从异步改成同步
+    await G.mongodb.cEvent(type).updateOne({uid: call.uid, type: type}, {$push: {rec: call.req.index}}, {upsert: true});
 
 
     await PlayerFun.sendPrize(call, [].concat(conf.prize[call.req.index]));

src/api_s2c/event/zhanling/ApiOpen.ts

@@ -24,7 +24,10 @@ export default async function (call: ApiCall<ReqOpen, ResOpen>) {
         await PayFun.delPayLog(
             call.uid, { payId: G.gc.zhanling.payId, val: [] }
         );
-        
+        // 战令重置的时候需要删除所有的任务进度，但是每天的任务进度不做处理，因为每天会自然重置，怕玩家会刷
+        // ZhanLingTasks.clearLog(call.uid, 'day');
+        ZhanLingTasks.clearLog(call.uid, 'week');
+        ZhanLingTasks.clearLog(call.uid, 'round');
         data = (await G.mongodb.cEvent('zhanling').findOneAndUpdate({
             uid: call.uid,
             type: 'zhanling'

src/api_s2c/jjc/ApiOpen.ts

@@ -30,6 +30,6 @@ export default async function (call: ApiCall<ReqOpen, ResOpen>) {
     });
 
     UserFun.activeHeadFrame(call.uid, 'jjc_rank', data["rank"] + 1);
-    JJCFun.checkUpdatePlayer()
+    //JJCFun.checkUpdatePlayer()
 
 }

src/fix_patch/patch_20240109-1.ts

@@ -0,0 +1,119 @@
+import { patchFun, patchInit } from "../patch";
+import { PublicShared } from "../shared/public/public";
+import { JJCFun } from "../public/jjc";
+
+function getRankPrize(rank: number, conf?: typeof G.gc.jjc_ph['']) {
+    if (!conf) {
+        conf = Object.values(G.gc.jjc_ph).filter(v => rank >= v.ph[0] && rank <= v.ph[1])[0];
+    }
+    if (conf) {
+        return [...conf.prize, { a: 'item', t: '11', n: typeof conf.rongyuprize == 'number' ? conf.rongyuprize : PublicShared.eval(conf.rongyuprize, { a: rank }) }];
+    } else {
+        return [];
+    }
+}
+
+class Path {
+
+    async addEmail(email, isCross = false) {
+        let { prize, uid, ...e } = email;
+        let lng = await G.redis.rawGet(`user:lng:${uid}`);
+        let sendEmail = {
+            _id: null,
+            uid: uid,
+            type: e.type,
+            title: e.lngTitle ? (e.lngTitle[lng] || e.lngTitle['ja']) : e.title,
+            content: e.lngContent ? (e.lngContent[lng] || e.lngContent['ja']) : e.content,
+            createTime: e.createTime || G.time,
+            contentInsertArr: e.contentInsertArr || []
+        } as any;
+
+        /**跨服邮件给sid标识*/
+        // if (isCross) {
+        //     sendEmail.sid = uid.split('_')[0];
+        // }
+        if ((prize === null || prize === void 0 ? void 0 : prize.length) > 0) {
+            sendEmail.prizeData = {
+                prize: email.prize,
+                isGet: false
+            };
+        }
+        if (email.g123log && Object.keys(email.g123log).length > 0)
+            sendEmail.g123log = email.g123log;
+
+        if (email.lngTitle) {
+            sendEmail.lngTitle = email.lngTitle;
+            sendEmail.lngContent = email.lngContent;
+        }
+        //太亏了！换其他清理机制，getAllEmail是性能消耗大户
+        //todo.. 换其他清理机制
+        // if (!isCross) {
+        //     let emailList = await this.getAllEmail(uid);
+        //     if (emailList.length >= 50) {
+        //         emailList.sort((a, b) => {
+        //             let noPrizeA = a.prizeData == undefined ? 0 : 1;
+        //             let noPrizeB = b.prizeData == undefined ? 0 : 1;
+        //             let getA = a.prizeData?.isGet == true ? 0 : 1;
+        //             let getB = b.prizeData?.isGet == true ? 0 : 1;
+        //             if (noPrizeA != noPrizeB) {
+        //                 return noPrizeA - noPrizeB;
+        //             } else if (getA != getB) {
+        //                 return getA - getB;
+        //             }
+        //             return a.createTime - b.createTime;
+        //         });
+        //         this.removeEmail(uid, emailList[0]._id);
+        //         G.server.sendMsgByUid(uid, 'msg_s2c/EmailDel', emailList[0]._id);
+        //     }
+        // }
+        //@ts-ignore
+        await G.mongodb.collection('email').insertOne({
+            ttl: new Date(), ...G.mongodb.conversionIdObj(sendEmail)
+        })
+    }
+
+    async sendEmail(uid: string, rank: number, prize: atn[]) {
+
+        if (uid.indexOf('npc_') != -1) return;
+
+        await this.addEmail({
+            uid: uid,
+            type: 'system',
+            title: G.gc.jjc_com.email.titel,
+            content: G.gc.jjc_com.email.content,
+            prize: prize,
+            contentInsertArr: [rank]
+        });
+    }
+    async fun1(a: any) {
+        for (let conf of Object.values(G.gc.jjc_ph)) {
+            let players = await JJCFun.getRankListUid(conf.ph[0] - 1, conf.ph[1]);
+
+            for (let index = 0; index < players.length; index++) {
+                let uid = players[index];
+                await this.sendEmail(uid, conf.ph[0] + index, getRankPrize(conf.ph[0] + index, conf));
+                console.log("sendEmail", uid, conf.ph[0] + index)
+            }
+        }
+
+        return "sucess!!!"
+    }
+
+
+
+    async run() {
+        await this.fun1(1);
+    }
+}
+
+async function main() {
+    await patchInit()
+    let patch = new Path();
+    await patch.run();
+    console.log("逻辑执行完成，等待退出");
+    setTimeout(function () {
+        console.log('结束程序');
+        process.exit();
+    }, 3000);
+}
+main();

src/fix_patch/patch_20240109.ts

@@ -0,0 +1,684 @@
+import { patchFun, patchInit } from "../patch";
+
+class Path {
+
+  async fun1(a: any) {
+    const con = {
+      "16_6575db20f6ef8b7da5c8f1fd": {
+        "item": {
+          "1": 55400000,
+          "12": 10600,
+          "2": 223000,
+          "6": 690
+        },
+        "attr": {
+          "rmbmoney": 30500,
+          "jinbi": 2850000000
+        }
+      },
+      "15_6575a14b2f930bd5e51ccde9": {
+        "item": {
+          "1": 137200000,
+          "12": 16600,
+          "2": 273700,
+          "6": 1735
+        },
+        "attr": {
+          "rmbmoney": 35200,
+          "jinbi": 3420000000
+        }
+      },
+      "10_6573c51480a92f081d78e1d9": {
+        "item": {
+          "1": 35600000,
+          "12": 13000,
+          "2": 67800,
+          "6": 1180
+        },
+        "attr": {
+          "rmbmoney": 12400,
+          "jinbi": 630000000
+        }
+      },
+      "10_6573ecd9a884822d24482a1a": {
+        "item": {
+          "1": 103200000,
+          "18": 9490,
+          "12": 28000,
+          "2": 421600,
+          "6": 1300
+        },
+        "attr": {
+          "rmbmoney": 53400,
+          "jinbi": 5210000000
+        }
+      },
+      "11_657412487fe3541fe7241a60": {
+        "item": {
+          "1": 35000000,
+          "12": 99300,
+          "2": 110900,
+          "6": 460
+        },
+        "attr": {
+          "rmbmoney": 19200,
+          "jinbi": 1830000000
+        }
+      },
+      "11_657436eb3bc021c4e335f356": {
+        "item": {
+          "1": 197200000,
+          "12": 243700,
+          "2": 597200,
+          "6": 2475
+        },
+        "attr": {
+          "rmbmoney": 97400,
+          "jinbi": 9930000000
+        }
+      },
+      "11_657428e87fe3541fe7245b75": {
+        "item": {
+          "1": 71200000,
+          "12": 64300,
+          "2": 219300,
+          "6": 910
+        },
+        "attr": {
+          "rmbmoney": 37300,
+          "jinbi": 3630000000
+        }
+      },
+      "10_6573aeb2602e0a72e8279b54": {
+        "item": {
+          "1": 17800000,
+          "12": 22300,
+          "2": 58100,
+          "6": 240
+        },
+        "attr": {
+          "rmbmoney": 10500,
+          "jinbi": 940000000
+        }
+      },
+      "11_657447453bc021c4e3362403": {
+        "item": {
+          "1": 322000000,
+          "18": 31290,
+          "12": 134800,
+          "2": 1297200,
+          "6": 4035
+        },
+        "attr": {
+          "rmbmoney": 162900,
+          "jinbi": 16160000000
+        }
+      },
+      "11_657405957b27be6c2f4cac11": {
+        "item": {
+          "1": 18600000,
+          "18": 1050,
+          "12": 74500,
+          "2": 79900,
+          "6": 245
+        },
+        "attr": {
+          "rmbmoney": 12000,
+          "jinbi": 980000000
+        }
+      },
+      "14_6575004f7aecd430eb86fbb5": {
+        "item": {
+          "1": 44000000,
+          "18": 3440,
+          "12": 104800,
+          "2": 182600,
+          "6": 545
+        },
+        "attr": {
+          "rmbmoney": 25300,
+          "jinbi": 2270000000
+        }
+      },
+      "16_6575d6ac2e4ba33a00a04cbc": {
+        "item": {
+          "1": 36600000,
+          "12": 13000,
+          "2": 108200,
+          "6": 470
+        },
+        "attr": {
+          "rmbmoney": 19100,
+          "jinbi": 1870000000
+        }
+      },
+      "12_6574823b27bd4264da470583": {
+        "item": {
+          "1": 8800000,
+          "12": 123000,
+          "2": 37500,
+          "6": 115
+        },
+        "attr": {
+          "rmbmoney": 7300,
+          "jinbi": 530000000
+        }
+      },
+      "16_6575b61caff1b610d8bc6c96": {
+        "item": {
+          "24": 6,
+          "10": 200,
+          "12": 55000,
+          "600": 20,
+          "18": 1400,
+          "1": 16200000,
+          "2": 64900,
+          "6": 180,
+          "9": 3500
+        },
+        "attr": {
+          "rmbmoney": 14400,
+          "jinbi": 840000000
+        }
+      },
+      "14_6574f2e66c7af0fe3713b718": {
+        "item": {
+          "1": 48800000,
+          "12": 12700,
+          "2": 90900,
+          "6": 655
+        },
+        "attr": {
+          "rmbmoney": 12400,
+          "jinbi": 1100000000
+        }
+      },
+      "11_65740da4deb68620911e96ef": {
+        "item": {
+          "1": 64200000,
+          "18": 5580,
+          "12": 28300,
+          "2": 265400,
+          "6": 820
+        },
+        "attr": {
+          "rmbmoney": 33800,
+          "jinbi": 3270000000
+        }
+      },
+      "15_657594c3a7981612a8ea7e0e": {
+        "item": {
+          "1": 96800000,
+          "18": 8870,
+          "12": 3700,
+          "2": 397200,
+          "6": 1230
+        },
+        "attr": {
+          "rmbmoney": 50400,
+          "jinbi": 4920000000
+        }
+      },
+      "11_657434f8290f4393568f16fe": {
+        "item": {
+          "1": 129000000,
+          "12": 198300,
+          "2": 392100,
+          "6": 1630
+        },
+        "attr": {
+          "jinbi": 6500000000
+        }
+      },
+      "14_657512ee7aecd430eb872b5d": {
+        "item": {
+          "1": 121800000,
+          "12": 36400,
+          "2": 363400,
+          "6": 1530
+        },
+        "attr": {
+          "rmbmoney": 31500,
+          "jinbi": 6150000000
+        }
+      },
+      "11_657454089beef4c060edab88": {
+        "item": {
+          "1": 96600000,
+          "18": 8660,
+          "12": 149200,
+          "2": 392900,
+          "6": 1215
+        },
+        "attr": {
+          "rmbmoney": 49800,
+          "jinbi": 4890000000
+        }
+      },
+      "10_6573e8aa80a92f081d7930b4": {
+        "item": {
+          "1": 242400000,
+          "18": 16210,
+          "12": 84100,
+          "2": 978800,
+          "6": 3040
+        },
+        "attr": {
+          "rmbmoney": 123100,
+          "jinbi": 12180000000
+        }
+      },
+      "11_6573fd7a08e89e5a6859446e": {
+        "item": {
+          "1": 178200000,
+          "18": 16230,
+          "12": 10900,
+          "2": 717000,
+          "6": 2225
+        },
+        "attr": {
+          "rmbmoney": 92000,
+          "jinbi": 8990000000
+        }
+      },
+      "11_65744fe2d0256beb85eed193": {
+        "item": {
+          "1": 262800000,
+          "18": 25540,
+          "12": 55800,
+          "2": 1057600,
+          "6": 3275
+        },
+        "attr": {
+          "rmbmoney": 134000,
+          "jinbi": 13190000000
+        }
+      },
+      "11_657440e7ee44bd9935bbbd7c": {
+        "item": {
+          "1": 83000000,
+          "18": 7160,
+          "12": 250900,
+          "2": 341800,
+          "6": 1055
+        },
+        "attr": {
+          "rmbmoney": 43300,
+          "jinbi": 4220000000
+        }
+      },
+      "11_657420932dd070117eb15e92": {
+        "item": {
+          "1": 307400000,
+          "18": 29210,
+          "12": 50200,
+          "2": 1239200,
+          "6": 3880
+        },
+        "attr": {
+          "jinbi": 15470000000
+        }
+      },
+      "14_65750da36439ef15582d6e6d": {
+        "item": {
+          "1": 105000000,
+          "12": 93900,
+          "2": 361000,
+          "6": 1335
+        },
+        "attr": {
+          "rmbmoney": 54100,
+          "jinbi": 5310000000
+        }
+      },
+      "12_6574762427bd4264da46ce63": {
+        "item": {
+          "1": 44400000,
+          "18": 3390,
+          "12": 15900,
+          "2": 185000,
+          "6": 555
+        },
+        "attr": {
+          "rmbmoney": 25000,
+          "jinbi": 2290000000
+        }
+      },
+      "16_6575e1625685671e63fe001f": {
+        "item": {
+          "1": 12600000,
+          "2": 51400,
+          "6": 155
+        },
+        "attr": {
+          "rmbmoney": 9200,
+          "jinbi": 710000000
+        }
+      },
+      "10_6573e236a884822d244816a0": {
+        "item": {
+          "1": 76200000,
+          "18": 6760,
+          "12": 79600,
+          "2": 310200,
+          "6": 945
+        },
+        "attr": {
+          "rmbmoney": 40700,
+          "jinbi": 3870000000
+        }
+      },
+      "10_6573a17268053554fe606611": {
+        "item": {
+          "1": 109200000,
+          "18": 9410,
+          "12": 58000,
+          "2": 428000,
+          "6": 2365
+        },
+        "attr": {
+          "rmbmoney": 55000,
+          "jinbi": 5240000000
+        }
+      },
+      "15_657595a3a7981612a8ea8009": {
+        "item": {
+          "1": 19200000,
+          "18": 830,
+          "12": 74800,
+          "2": 84100,
+          "6": 1115
+        },
+        "attr": {
+          "rmbmoney": 11300,
+          "jinbi": 990000000
+        }
+      },
+      "11_657438a83bc021c4e335f86e": {
+        "item": {
+          "1": 71200000,
+          "18": 6300,
+          "12": 55600,
+          "2": 292500,
+          "6": 905
+        },
+        "attr": {
+          "rmbmoney": 37200,
+          "jinbi": 3600000000
+        }
+      },
+      "10_6573e0395fe4caaf29a9b83c": {
+        "item": {
+          "1": 9000000,
+          "12": 184000,
+          "2": 45800,
+          "6": 135
+        },
+        "attr": {
+          "rmbmoney": 6400,
+          "jinbi": 530000000
+        }
+      },
+      "10_6573e596dc05fa03150d7db1": {
+        "item": {
+          "1": 12800000,
+          "18": 410,
+          "12": 15400,
+          "2": 60000,
+          "6": 175
+        },
+        "attr": {
+          "rmbmoney": 8200,
+          "jinbi": 690000000
+        }
+      },
+      "14_65752c79c85dd4cf1a874893": {
+        "item": {
+          "1": 14200000,
+          "12": 33700,
+          "2": 64500,
+          "6": 185
+        },
+        "attr": {
+          "rmbmoney": 8900,
+          "jinbi": 790000000
+        }
+      },
+      "12_657455ed6b804f4a6d4b53a2": {
+        "item": {
+          "1": 160800000,
+          "18": 14900,
+          "12": 4800,
+          "2": 650900,
+          "6": 2025
+        },
+        "attr": {
+          "rmbmoney": 82000,
+          "jinbi": 8080000000
+        }
+      },
+      "12_657481316ad7b8861da8a914": {
+        "item": {
+          "1": 5600000,
+          "18": 450,
+          "12": 34600,
+          "2": 25500,
+          "6": 65
+        },
+        "attr": {
+          "rmbmoney": 7800,
+          "jinbi": 300000000
+        }
+      },
+      "4_6571c11bb0b5337a4d3a63a0": {
+        "item": {
+          "24": 7,
+          "10": 400,
+          "12": 15600,
+          "600": 50,
+          "18": 190,
+          "1": 5200000,
+          "2": 16300,
+          "6": 10,
+          "9": 8500
+        },
+        "attr": {
+          "rmbmoney": 8800,
+          "jinbi": 310000000
+        }
+      },
+      "10_6573714bc7069a58e96ba077": {
+        "item": {
+          "1": 14400000,
+          "18": 610,
+          "12": 11800,
+          "2": 66400,
+          "6": 190
+        },
+        "attr": {
+          "rmbmoney": 9000,
+          "jinbi": 770000000
+        }
+      },
+      "11_65744ba29beef4c060ed803c": {
+        "item": {
+          "1": 331800000,
+          "12": 14800,
+          "2": 1001400,
+          "6": 4155
+        },
+        "attr": {
+          "rmbmoney": 167500,
+          "jinbi": 16670000000
+        }
+      },
+      "16_6575d57c5685671e63fdb6ee": {
+        "item": {
+          "1": 13600000,
+          "12": 42700,
+          "2": 44500,
+          "6": 420
+        },
+        "attr": {
+          "rmbmoney": 7000,
+          "jinbi": 430000000
+        }
+      },
+      "11_65743bb09beef4c060ed46e7": {
+        "item": {
+          "10": 300,
+          "12": 8100,
+          "600": 30,
+          "18": 920,
+          "1": 18400000,
+          "2": 69600,
+          "6": 170,
+          "9": 4500
+        },
+        "attr": {
+          "rmbmoney": 13700,
+          "jinbi": 950000000
+        }
+      },
+      "10_6573bb4b68053554fe60940c": {
+        "item": {
+          "1": 19400000,
+          "18": 1080,
+          "12": 63000,
+          "2": 83100,
+          "6": 235
+        },
+        "attr": {
+          "rmbmoney": 12300,
+          "jinbi": 1010000000
+        }
+      },
+      "16_6575d97df2211cd2ff29ba12": {
+        "item": {
+          "1": 3400000,
+          "12": 11100,
+          "2": 16700,
+          "6": 50
+        },
+        "attr": {
+          "rmbmoney": 5000,
+          "jinbi": 250000000
+        }
+      },
+      "11_657434c6d0256beb85ee6fae": {
+        "item": {
+          "1": 80600000,
+          "18": 7360,
+          "12": 232000,
+          "2": 332200,
+          "6": 1025
+        },
+        "attr": {
+          "rmbmoney": 42100,
+          "jinbi": 4090000000
+        }
+      },
+      "16_6575b6d0f6ef8b7da5c84bf0": {
+        "item": {
+          "1": 70600000,
+          "12": 29700,
+          "2": 218200,
+          "6": 900
+        },
+        "attr": {
+          "rmbmoney": 36000,
+          "jinbi": 3610000000
+        }
+      },
+      "10_6587fbf00c11d852663c5bbb": {
+        "item": {
+          "1": 26800000,
+          "18": 1940,
+          "12": 168000,
+          "2": 118300,
+          "6": 350
+        },
+        "attr": {
+          "rmbmoney": 15300,
+          "jinbi": 1410000000
+        }
+      },
+      "10_657397c2f31ed0c046ef3730": {
+        "item": {
+          "1": 220800000,
+          "18": 1900,
+          "12": 8800,
+          "2": 701400,
+          "6": 2780
+        },
+        "attr": {
+          "rmbmoney": 112100,
+          "jinbi": 11100000000
+        }
+      }
+    }
+
+    const uids = Object.keys(con);
+    let _users = await G.mongodb.find('user', { uid: { $in: uids } })
+    for (let i = 0; i < _users.length; i++) {
+      let user = _users[i]
+      const uid = user.uid
+      const _delattr = con[uid]["attr"]
+      const _delitem = con[uid]["item"]
+      let _setUserData = {}
+      let _dellog = { "attr": {}, "item": {} }
+      for (let t in _delattr) {
+        if (t == "rmbmoney") {
+          let v = user.rmbmoney - _delattr[t]
+          if (v < 0) { v = 0 }
+          _setUserData[t] = v
+          _dellog["attr"][t] = { "old": user.rmbmoney, "new": v }
+        }
+        else if (t == "jinbi") {
+          let v = user.jinbi - _delattr[t]
+          if (v < 0) { v = 0 }
+          _setUserData[t] = v
+          _dellog["attr"][t] = { "old": user.jinbi, "new": v }
+        }
+      }
+
+      const itemIds = Object.keys(_delitem);
+      // 删除item
+      let _itemlist = await G.mongodb.collection('item').find({ "uid": uid, "itemId": { "$in": itemIds } }).toArray();
+      for (let i = 0; i < _itemlist.length; i++) {
+        const _item = _itemlist[i]
+        const _itemid = _item.itemId
+        const del = _delitem[_itemid] || 0
+        let v = _item.num - del
+        if (v < 0) { v = 0 }
+        let _setItemData = {}
+        _setItemData["num"] = v
+        _dellog["item"][_itemid] = { "old": _item.num, "new": v }
+        await G.mongodb.collection('item').updateOne({ "uid": uid, "itemId": _itemid }, { "$set": _setItemData });
+      }
+      await G.mongodb.collection('user').updateOne({ "uid": uid }, { "$set": _setUserData });
+      // 输出日志
+      console.log(uid, ":", _dellog);
+    }
+
+    return "sucess!!!"
+  }
+
+
+
+  async run() {
+    await this.fun1(1);
+  }
+}
+
+async function main() {
+  await patchInit()
+  let patch = new Path();
+  await patch.run();
+  console.log("逻辑执行完成，等待退出");
+  setTimeout(function () {
+    console.log('结束程序');
+    process.exit();
+  }, 3000);
+}
+main();

src/fix_patch/patch_20240110.ts

@@ -0,0 +1,117 @@
+import { ReqEmail } from "../monopoly/protocols/PtlEmail";
+import { patchInit } from "../patch";
+import { MsgEmail } from "../shared/protocols/msg_s2c/MsgEmail";
+import { PublicShared } from "../shared/public/public";
+
+
+class Path {
+
+    async addEmail(email: ReqEmail & { createTime?: number; }) {
+        let { prize, uid, ...e } = email;
+        let lng = await G.redis.rawGet(`user:lng:${uid}`)
+
+        let sendEmail: MsgEmail = {
+            _id: null,
+            uid: uid,
+            type: e.type,
+            title: e.lngTitle ? (e.lngTitle[lng] || e.lngTitle['ja']) : e.title,
+            content: e.lngContent ? (e.lngContent[lng] || e.lngContent['ja']) : e.content,
+            createTime: e.createTime || G.time,
+            contentInsertArr: e.contentInsertArr || []
+        };
+
+        if (prize?.length > 0) {
+            sendEmail.prizeData = {
+                prize: email.prize,
+                isGet: false
+            };
+        }
+
+        if (email.g123log && Object.keys(email.g123log).length > 0) sendEmail.g123log = email.g123log;
+
+        if (email.lngTitle) {
+            sendEmail.lngTitle = email.lngTitle
+            sendEmail.lngContent = email.lngContent
+        }
+
+        await G.mongodb.collection('email').insertOne({
+            ttl: new Date(), ...G.mongodb.conversionIdObj(sendEmail)
+        });
+    }
+
+    async fun1(a: any) {
+        let taskType = 2;
+        let users = await G.mongodb.collection('user').find({ loginTime: { $gte: 1704643200 } }).toArray();
+        for (let i = 0; i < users.length; i++) {
+            let user = users[i];
+            let unFinishTask = (await G.mongodb.collection('task').find({
+                uid: user.uid, type: taskType, finish: 0
+            }, { projection: { taskid: 1 } }).toArray()).map(i => i.taskid);
+
+            if (unFinishTask.length >= 2) {
+                let deltask = unFinishTask.sort().slice(1);
+                await G.mongodb.collection("task").deleteOne({
+                    uid: user.uid, taskid: { $in: deltask }
+                });
+                console.log(`删除玩家${user.uid}任务:${deltask}`);
+            }
+        }
+    }
+    /**
+     * 补发玩家终身卡奖励
+    */
+    async fun2(a: any) {
+        let logs = await G.mongodb.collection("payLogNew").find(
+            { key: "zhongshenka", del_time: { $exists: false } }, { projection: { _id: 0, } }
+        ).toArray();
+
+        if (logs.length == 0) {
+            console.log("没有终身卡数据，不发放终身卡");
+            return
+        }
+        
+        let wzt = PublicShared.getToWeekMondayZeroTime();
+        let con = G.gc.payEmail.zhongshenka.filter(e => e.day == 7)[0];
+        for (let i = 0; i < logs.length; i++) {
+
+            // 查询玩家邮件
+            let emails = await G.mongodb.collection('email').find({
+                uid: logs[i].uid, title: con.title, createTime: { $gte: wzt }
+            }).toArray();
+
+
+            if (emails.length == 0) {
+                // 发送邮件
+                this.addEmail({
+                    uid: logs[i].uid,
+                    type: "system",
+                    title: con.title,
+                    content: con.content,
+                    contentInsertArr: [],
+                    createTime: G.time,
+                    prize: con.prize,
+                })
+                console.log("发放终身卡", logs[i].uid);
+            } else {
+                console.log("本周已发送过 不发放终身卡", logs[i].uid);
+            }
+        }
+    }
+
+    async run() {
+        await this.fun1(1);
+        await this.fun2(1);
+    }
+}
+
+async function main() {
+    await patchInit()
+    let patch = new Path();
+    await patch.run();
+    console.log("逻辑执行完成，等待退出");
+    setTimeout(function () {
+        console.log('结束程序');
+        process.exit();
+    }, 3000);
+}
+main();

src/fix_patch/patch_20240111.ts

@@ -0,0 +1,61 @@
+import {ReqEmail} from "../monopoly/protocols/PtlEmail";
+import {patchInit} from "../patch";
+import {MsgEmail} from "../shared/protocols/msg_s2c/MsgEmail";
+import {PublicShared} from "../shared/public/public";
+
+
+class Path {
+    async fun1(a: any) {
+        let taskType = 2;
+        let users = await G.mongodb.collection('user').find({}, {
+            projection: {uid: 1}
+        }).toArray();
+        // let users = await G.mongodb.collection('user').find({ loginTime: { $gte: 1704643200 } }).toArray();
+        for (let i = 0; i < users.length; i++) {
+            let user = users[i];
+
+            console.log(`处理玩家${user.uid}数据`);
+            let task = Object.assign({}, ...(await G.mongodb.collection('task').find({
+                uid: user.uid, type: taskType
+            }, {projection: {taskid: 1, finish: 1}}).toArray()).map(i => {
+                return {[i.taskid]: i.finish}
+            }))
+
+            let deltask = [];
+            let sortTask = Object.keys(task).sort();
+
+            for (let taskid of sortTask) {
+                if (task[taskid] == 1) continue;
+                let con = G.gc.task[taskType][taskid];
+                if (task[con.followtask]) {
+                    let i = sortTask.indexOf(taskid);
+                    deltask.push(...sortTask.slice(i + 1).map(i => Number(i)));
+                }
+            }
+
+            if (deltask.length > 0) {
+                await G.mongodb.collection("task").deleteMany(
+                    {uid: user.uid, taskid: {$in: deltask}}
+                )
+                console.log(`删除玩家${user.uid}任务:${deltask}`)
+            }
+        }
+    }
+
+    async run() {
+        await this.fun1(1);
+    }
+}
+
+async function main() {
+    await patchInit()
+    let patch = new Path();
+    await patch.run();
+    console.log("逻辑执行完成，等待退出");
+    setTimeout(function () {
+        console.log('结束程序');
+        process.exit();
+    }, 3000);
+}
+
+main();

src/module/collection_fightLog.ts

@@ -1,4 +1,4 @@
 import {fightResult} from '../shared/fightControl/fightType';
 
 
-export type CollectionFightLog = fightResult & { uid: string, type: string };
+export type CollectionFightLog = fightResult & { uid: string, type: string, ttl: Date};

src/public/dxlt.ts

@@ -19,7 +19,8 @@ export class DxltFun {
     }
     /**回退层数 */
     static backLayer(data: ResOpen) {
-        let num = data.curLayer - G.gc.dxlt_com.dayResetBackLayer;
+        //let num = data.curLayer - G.gc.dxlt_com.dayResetBackLayer;
+        let num = (data.curLayer-30) - (data.curLayer-30)%5+1
         data.curLayer = num < 1 ? 1 : num;
         data.over = G.gc.dxlt_layer[data.curLayer].type == 2;
     }

src/public/fight.ts

@@ -87,9 +87,13 @@ export class FightFun {
 
     /**挑战竞技场 */
     static async fightJJc(call: ApiCall, rankInfo: rankInfo) {
-        if (rankInfo.player.uid.indexOf('npc_') != -1) return await this.fightNpc(call, G.gc.jjc_npc[rankInfo.player.uid].npcId, 'jjc', await this.getPlayerFightData(call.conn.uid));
+        let result;
 
-        let result = this.fight([await this.getPlayerFightData(call.conn.uid), await this.getPlayerFightData(rankInfo.player.uid)]);
+        if (rankInfo.player.uid.indexOf('npc_') != -1) {
+            result = await this.fightNpc(call, G.gc.jjc_npc[rankInfo.player.uid].npcId, 'jjc', await this.getPlayerFightData(call.conn.uid));
+        } else {
+            result = this.fight([await this.getPlayerFightData(call.conn.uid), await this.getPlayerFightData(rankInfo.player.uid)]);
+        }
 
         // 竞技场 战败触发推送礼包
         if (result.winSide != 0) {
@@ -140,11 +144,11 @@ export class FightFun {
         let writeList = ['ganhai', 'jjc', 'hbzbJfs', 'hbzbZbs', 'slzd', 'clsl']
         if (uid.indexOf('npc') != -1 || !writeList.includes(type)) return;
 
-        G.mongodb.collection('fightLog').insertOne({ uid, type, ...result })
+        G.mongodb.collection('fightLog').insertOne({ uid, type, ...result, ttl: new Date() })
 
     }
 
     static async readLog(uid: string, type: string, len = 20) {
-        return await G.mongodb.collection('fightLog').find({ uid, type }).limit(len).toArray() || []
+        return await G.mongodb.collection('fightLog').find({ uid, type }).limit(len).sort({ _id: -1 }).toArray() || []
     }
 }

src/public/jjc.ts

@@ -94,37 +94,37 @@ export class JJCFun {
      * @param uTimeOffset
      * @param isUpdate 是否更新数据
      */
-    static async checkUpdatePlayer(min: number = 0, max: number = 1000, uTimeOffset: number = 600, isUpdate: boolean = true) {
-        // 获取指定排名用户uid
-        let sortInfo = await this.getRankListUid(min, max)
-        if (!sortInfo.length) return []
-        let updateArr = []
+    // static async checkUpdatePlayer(min: number = 0, max: number = 1000, uTimeOffset: number = 600, isUpdate: boolean = true) {
+    //     // 获取指定排名用户uid
+    //     let sortInfo = await this.getRankListUid(min, max)
+    //     if (!sortInfo.length) return []
+    //     let updateArr = []
 
-        let users = await G.redis.hGetAll('rank:jjc:data')
+    //     let users = await G.redis.hGetAll('rank:jjc:data')
 
-        for (let i = 0; i < sortInfo.length; i++) {
-            let uid = sortInfo[i]
-            let rankInfo = users[uid]
-            if (!rankInfo?.player) continue
-            // 比对utime，判断是否更新数据
-            if (!rankInfo.player.isNpc) {
-                if (!rankInfo.utime || (rankInfo.utime && rankInfo.utime < (G.time - uTimeOffset))) {
-                    updateArr.push(rankInfo)
-                }
-            }
-        }
-        // 更新数据
-        if (isUpdate && updateArr.length > 0) {
-            let playerArrInfo = await G.mongodb.collection("user").find({uid: {$in: updateArr.map(i => i.uid)}}).toArray()
-            for (let i = 0; i < playerArrInfo.length; i++) {
-                let playerInfo = playerArrInfo[i]
-                let index = updateArr.findIndex(x => x.player.uid == playerInfo.uid)
-                updateArr[index].player = playerInfo
-                updateArr[index].utime = G.time
-                this.updatePlayerData(playerInfo.uid, updateArr[index]);
-            }
-        }
-    }
+    //     for (let i = 0; i < sortInfo.length; i++) {
+    //         let uid = sortInfo[i]
+    //         let rankInfo = users[uid]
+    //         if (!rankInfo?.player) continue
+    //         // 比对utime，判断是否更新数据
+    //         if (!rankInfo.player.isNpc) {
+    //             if (!rankInfo.utime || (rankInfo.utime && rankInfo.utime < (G.time - uTimeOffset))) {
+    //                 updateArr.push(rankInfo)
+    //             }
+    //         }
+    //     }
+    //     // 更新数据
+    //     if (isUpdate && updateArr.length > 0) {
+    //         let playerArrInfo = await G.mongodb.collection("user").find({uid: {$in: updateArr.map(i => i.uid)}}).toArray()
+    //         for (let i = 0; i < playerArrInfo.length; i++) {
+    //             let playerInfo = playerArrInfo[i]
+    //             let index = updateArr.findIndex(x => x.player.uid == playerInfo.uid)
+    //             updateArr[index].player = playerInfo
+    //             updateArr[index].utime = G.time
+    //             this.updatePlayerData(playerInfo.uid, updateArr[index]);
+    //         }
+    //     }
+    // }
 
     /**
      * 获取指定范围排名的用户，仅返回uid[]

src/public/user.ts

@@ -305,8 +305,11 @@ export class UserFun {
                 change = true;
                 gud.headFrames[conf.id] = -1;
             }
+            else if(conf?.cond?.[0] == "jjc_rank") {
+                    change = true;
+                    gud.headFrames[conf.id] = -1;
+            }
         }
-
         if (change) {
             PlayerFun.changeAttr(uid, {headFrames: gud.headFrames});
             G.server.sendMsgByUid(uid, 'msg_s2c/PlayerChange', {headFrames: gud.headFrames});

src/setRedis.ts

@@ -78,8 +78,8 @@ async function clearRedis() {
         G.redis.fromatKey('equip'),
         G.redis.fromatKey('shiwu'),
         G.redis.fromatKey('tanxian'),
-        G.redis.fromatKey('gbtx'),
-        G.redis.fromatKey('dxlt'),
+        //G.redis.fromatKey('gbtx'),
+        //G.redis.fromatKey('dxlt'),
     ])
 }