fix:脚本修改

src/fix_patch/patch_20240112.ts

@@ -3,13 +3,32 @@ import { patchFun, patchInit } from "../patch";
 class Path {
 
   async huodong2(a: any) {
+    const con ={
+        2002:[
+            { payId: '', num: 1, prize: [{a: 'item', t: '50', n: 20}, {a: 'attr', t: 'rmbmoney', n: 200}], free: true },
+          { payId: 'duihuan_1_1', prize: [{a: 'item', t: '50', n: 50}, {a: 'attr', t: 'rmbmoney', n: 600}], free: false },
+          { payId: 'duihuan_1_2', prize: [{a: 'item', t: '50', n: 100}, {a: 'attr', t: 'rmbmoney', n: 1360}], free: false },
+          { payId: 'duihuan_1_3', prize: [{a: 'item', t: '50', n: 200}, {a: 'attr', t: 'rmbmoney', n: 2560}], free: false },
+          { payId: 'duihuan_1_4', prize: [{a: 'item', t: '50', n: 600}, {a: 'attr', t: 'rmbmoney', n: 6560}], free: false },
+          { payId: 'duihuan_1_5', prize: [{a: 'item', t: '50', n: 1200}, {a: 'attr', t: 'rmbmoney', n: 12960}], free: false },
+        ],
+      2003: [
+                    { payId: '', num: 1, prize: [{a: 'item', t: '50', n: 20}, {a: 'attr', t: 'rmbmoney', n: 200}], free: true },
+                    { payId: 'duihuan_1_1', prize: [{a: 'item', t: '50', n: 50}, {a: 'attr', t: 'rmbmoney', n: 600}], free: false },
+                    { payId: 'duihuan_1_2', prize: [{a: 'item', t: '50', n: 100}, {a: 'attr', t: 'rmbmoney', n: 1360}], free: false },
+                    { payId: 'duihuan_1_3', prize: [{a: 'item', t: '50', n: 200}, {a: 'attr', t: 'rmbmoney', n: 2560}], free: false },
+                    { payId: 'duihuan_1_4', prize: [{a: 'item', t: '50', n: 600}, {a: 'attr', t: 'rmbmoney', n: 6560}], free: false },
+                    { payId: 'duihuan_1_5', prize: [{a: 'item', t: '50', n: 1200}, {a: 'attr', t: 'rmbmoney', n: 12960}], free: false },
+                ]
+    }
+
     const hdids = [2002,2003]
     const hdinfos = await G.mongodb.find('hdinfo', { hdid: { $in: hdids } })
     for (let i = 0; i < hdinfos.length; i++) {
       let hdinfo = hdinfos[i]
-      hdinfo.data.gift = {}
+      hdinfo.data.event.gift = con[hdinfo.hdid]
 
-      await G.mongodb.collection('hdinfo').updateOne({ "hdid": hdinfo.hdid}, { "$set": {"data.figt": {}} });
+      await G.mongodb.collection('hdinfo').updateOne({ "hdid": hdinfo.hdid}, { "$set": {"data.event.gift": hdinfo.data.event.gift}});
       console.log(hdinfo.hdid,"finish")
     }
     return "sucess!!!"

src/public/chat.ts

@@ -4,6 +4,7 @@ import { MsgChat } from '../shared/protocols/msg_s2c/MsgChat';
 import { player } from '../shared/protocols/user/type';
 import { chatLog, chatMsgLog } from '../shared/protocols/type'
 import { PublicShared } from '../shared/public/public';
+import { clusterRunOnce } from '../clusterUtils';
 
 const msgListLen = {
     'cross': 30,
@@ -28,13 +29,9 @@ export function getCrossChatGroupByOpenDay(){
 export class ChatFun {
     /**新增消息 */
     static async newMsg(sendData: MsgChat) {
-        G.mongodb.collection('chat').updateOne(
+        let addToDB = 0;
-            { type: `${sendData.type}${sendData.type == 'guild' ? (sendData.sender as player)?.ghId : ''}` },
-            { $push: { list: { $each: [sendData], $slice: -msgListLen[sendData.type] } } },
-            { upsert: true }
-        );
-
         if (sendData.type == 'guild') {
+            addToDB = 1;
             G.server.broadcastClusterMsg('msg_s2c/Chat', sendData,{ghId:(sendData.sender as player)?.ghId});
         }else if(sendData.type == 'cross'){
             //所有的子进程都会收到，不需要集群内分别广播
@@ -42,9 +39,27 @@ export class ChatFun {
                 //如果时候同一个分组的
                 delete sendData?.otherData?.group;
                 G.server.broadcastMsg('msg_s2c/Chat', sendData);
+                addToDB = 2;
             }
         }else{
             G.server.broadcastClusterMsg('msg_s2c/Chat', sendData);
+            addToDB = 1;
+        }
+
+        if(addToDB == 1){
+            G.mongodb.collection('chat').updateOne(
+                { type: `${sendData.type}${sendData.type == 'guild' ? (sendData.sender as player)?.ghId : ''}` },
+                { $push: { list: { $each: [sendData], $slice: -msgListLen[sendData.type] } } },
+                { upsert: true }
+            );
+        }else if(addToDB == 2){
+            clusterRunOnce(()=>{
+                G.mongodb.collection('chat').updateOne(
+                    { type: `${sendData.type}${sendData.type == 'guild' ? (sendData.sender as player)?.ghId : ''}` },
+                    { $push: { list: { $each: [sendData], $slice: -msgListLen[sendData.type] } } },
+                    { upsert: true }
+                );
+            })
         }
         
     }