Merge branch 'bugfix' into dev

# Conflicts: # src/public/pay.ts
fix 重大bug
2023-12-29 13:53:02 +08:00 · 2023-12-29 13:51:55 +08:00 · 2023-12-29 11:57:41 +08:00 · 2023-12-29 01:19:47 +08:00 · 2023-12-29 01:19:16 +08:00 · 2023-12-29 01:07:27 +08:00
14 changed files with 4634 additions and 58 deletions
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -37,6 +37,7 @@
    "axios": "^1.4.0",
    "crypto-js": "^4.1.1",
    "express": "^4.18.2",
+    "inspector-api": "^1.4.8",
    "ioredis": "^5.3.2",
    "json5": "^2.2.3",
    "mathjs": "^11.4.0",
--- a/src/api_o2s/games/Apiheapdump.ts
+++ b/src/api_o2s/games/Apiheapdump.ts
@ -1,6 +1,8 @@
 import { ApiCall } from "tsrpc";
 import { Reqheapdump, Resheapdump } from "../../monopoly/protocols/games/Ptlheapdump";
 var heapdump = require('heapdump');
+import Inspector from 'inspector-api'
+const inspector = new Inspector({ storage: { type: 'fs' } })

 export default async function (call: ApiCall<Reqheapdump, Resheapdump>) {

@ -20,4 +22,24 @@ export default async function (call: ApiCall<Reqheapdump, Resheapdump>) {
            data:"gc..."
        })
    }
+
+    if(call.req.act == "cpustart"){
+        await inspector.profiler.enable()
+        await inspector.profiler.start()
+        console.log('CPU profile has been start')
+        call.succ({
+            code:200,
+            data:"profiler.start"
+        })
+    }
+
+    if(call.req.act == "cpustop"){
+        await inspector.profiler.stop()
+        await inspector.profiler.disable()
+        console.log('CPU profile has been stop')
+        call.succ({
+            code:200,
+            data:"profiler.cpustop"
+        })
+    }
 }
--- a/src/api_s2c/hongdian/fun.ts
+++ b/src/api_s2c/hongdian/fun.ts
@ -396,6 +396,12 @@ export class HuoDongHongDianFun {
            return {show: true}
        }

+        for (let i = 1; i <= data.taskval.length; i++) {
+            if (data?.taskval[i] >= _hd?.data?.task?.[i]?.pval && !data?.taskfinish.find(v => v == i + '')) {
+                return {show: true}
+            }
+        }
+
        return {show: false}
    }

--- a/src/fix_patch/patch_hdinfo_20231228.ts
+++ b/src/fix_patch/patch_hdinfo_20231228.ts
@ -72,10 +72,11 @@ async function main() {
    await patchInit()
    let patch = new Path();
    await patch.run();
-    setInterval(() => {
-        console.log(new Date().format("MM-dd hh:mm:ss"));
-    }, 1000);
    console.log("逻辑执行完成，等待退出");
+    setTimeout(function() {
+        console.log('结束程序');
+        process.exit();
+    }, 3000);
 }

 main();
--- a/src/fix_patch/patch_rank_delData.ts
+++ b/src/fix_patch/patch_rank_delData.ts
@ -0,0 +1,45 @@
+import { patchFun, patchInit } from "../patch";
+
+class Path{
+    @patchFun
+    async fun1(a:any) {
+        //这里执行脚本的内容，加了patchFun的函数，不允许重复执行
+        console.log("这是第1个脚本里内容");
+        G.ioredis.del(`rank:kfjs1:data`);
+        G.ioredis.del(`rank:kfjs2:data`);
+        G.ioredis.del(`rank:kfjs3:data`);
+        G.ioredis.del(`rank:kfjs4:data`);
+        G.ioredis.del(`rank:kfjs5:data`);
+        G.ioredis.del(`rank:kfjs6:data`);
+        G.ioredis.del(`rank:kfjs7:data`);
+        G.ioredis.del(`rank:slzd1:data`);
+        G.ioredis.del(`rank:slzd2:data`);
+        G.ioredis.del(`rank:slzd3:data`);
+        G.ioredis.del(`rank:slzd4:data`);
+        G.ioredis.del(`rank:slzd5:data`);
+        G.ioredis.del(`rank:slzd6:data`);
+        G.ioredis.del(`rank:qjzzd:data`);
+        G.ioredis.del(`rank:tanxian:data`);
+        G.ioredis.del(`rank:tujian:data`);
+        G.ioredis.del(`rank:zccg:data`);
+        G.ioredis.del(`rank:zhanli:data`);
+        console.log("这是第1个脚本执行完成");
+        return 12
+    }
+
+    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();
--- a/src/fix_patch/patch_test.ts
+++ b/src/fix_patch/patch_test.ts
@ -25,9 +25,10 @@ async function main(){
    await patchInit()
    let patch = new Path();
    await patch.run();
-    setInterval(() => {
-        console.log(new Date().format("MM-dd hh:mm:ss"));
-    }, 1000);
    console.log("逻辑执行完成，等待退出");
+    setTimeout(function() {
+        console.log('结束程序');
+        process.exit();
+    }, 3000);
 }
 main();
--- a/src/json/g123item.json
+++ b/src/json/g123item.json
@ -7139,6 +7139,27 @@
      "rarity": 4
    }
  },
+  "item^50011": {
+    "itemId": "item^50011",
+    "name": "新春安宁",
+    "i18nKey": "playerheadFrame_name_25",
+    "detailI18nKey": "intr_item_describe_50011",
+    "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png",
+    "value": 0,
+    "typeId": "item",
+    "typeName": "道具",
+    "isStoreSupported": true,
+    "isAiSupported": true,
+    "attributes": {
+      "storeDisplayPrice": null,
+      "storeCategory": "",
+      "setQuantity": 1,
+      "purchaseLimit": 0,
+      "sellMinCp": 100,
+      "sellMaxCp": 500,
+      "rarity": 4
+    }
+  },
  "item^50101": {
    "itemId": "item^50101",
    "name": "冰天雪地",
@ -7223,6 +7244,27 @@
      "rarity": 4
    }
  },
+  "item^50105": {
+    "itemId": "item^50105",
+    "name": "新年快乐",
+    "i18nKey": "playerChatFrame_name_9",
+    "detailI18nKey": "intr_item_describe_50105",
+    "iconUrl": "https://ik.imagekit.io/g123/production-ctw-box/game-box/preview/6ffd84658d75d5247f7f01b2f00ae3e6beda7163237c025ff8f0a58c.png",
+    "value": 0,
+    "typeId": "item",
+    "typeName": "道具",
+    "isStoreSupported": true,
+    "isAiSupported": true,
+    "attributes": {
+      "storeDisplayPrice": null,
+      "storeCategory": "",
+      "setQuantity": 1,
+      "purchaseLimit": 0,
+      "sellMinCp": 100,
+      "sellMaxCp": 500,
+      "rarity": 4
+    }
+  },
  "item^50201": {
    "itemId": "item^50201",
    "name": "招贤纳士",
--- a/src/json/huodong.json5
+++ b/src/json/huodong.json5
@ -2672,7 +2672,7 @@
                {
                    a: 'item',
                    t: '49',
-                    n: 6,
+                    n: 4,
                    p: 10,
                    s: 3600
                }
@ -2733,7 +2733,7 @@
                {
                    a: 'item',
                    t: '49',
-                    n: 6,
+                    n: 4,
                    p: 10,
                    s: 3600
                }
@ -3023,15 +3023,17 @@
        "showtime" : "仅供参考，会复写正确值",
        "data" : {
            tasks: [
-                { total: 100, prize: [{a: 'attr', t: 'rmbmoney', n: 500},{a: 'item', t: '4', n: 2}] },
-                { total: 200, prize: [{a: 'attr', t: 'rmbmoney', n: 1000},{a: 'item', t: '12', n: 500}]},
-                { total: 500, prize: [{a: 'attr', t: 'rmbmoney', n: 1500},{a: 'item', t: '4', n: 5}]},
-                { total: 1000, prize: [{a: 'attr', t: 'rmbmoney', n: 2000},{a: 'item', t: '600', n: 20}]},
-                { total: 2000, prize: [{a: 'attr', t: 'rmbmoney', n: 3000},{a: 'item', t: '609', n: 1}]},
-                { total: 3000, prize: [{a: 'attr', t: 'rmbmoney', n: 6000},{a: 'item', t: '611', n: 1}]},
-                { total: 5000, prize: [{a: 'attr', t: 'rmbmoney', n: 10000},{a: 'item', t: '610', n: 1}]}
-            ]
-        },
+                { total: 1000, prize: [{a: 'attr', t: 'rmbmoney', n: 500},{a: 'item', t: '4', n: 2}] },
+                { total: 2000, prize: [{a: 'attr', t: 'rmbmoney', n: 1000},{a: 'item', t: '12', n: 500}]},
+                { total: 5000, prize: [{a: 'attr', t: 'rmbmoney', n: 1500},{a: 'item', t: '4', n: 5}]},
+                { total: 10000, prize: [{a: 'attr', t: 'rmbmoney', n: 2000},{a: 'item', t: '600', n: 20}]},
+                { total: 20000, prize: [{a: 'attr', t: 'rmbmoney', n: 3000},{a: 'item', t: '609', n: 1}]},
+                { total: 30000, prize: [{a: 'attr', t: 'rmbmoney', n: 6000},{a: 'item', t: '611', n: 1}]},
+                { total: 50000, prize: [{a: 'attr', t: 'rmbmoney', n: 10000},{a: 'item', t: '610', n: 1}]}
+				]
+			}
+		},
+		{
 		"hdid" : 5001,   // 唯一活动id   累计充值
        "htype" : 5,  // 后端唯一识别标识
        "stype" : 500,  // 前端唯一识别标识（看前端需要是否修改）
@ -3044,15 +3046,17 @@
        "showtime" : "仅供参考，会复写正确值",
        "data" : {
            tasks: [
-                { total: 100, prize: [{a: 'attr', t: 'rmbmoney', n: 500},{a: 'item', t: '4', n: 2}] },
-                { total: 200, prize: [{a: 'attr', t: 'rmbmoney', n: 1000},{a: 'item', t: '12', n: 500}]},
-                { total: 500, prize: [{a: 'attr', t: 'rmbmoney', n: 1500},{a: 'item', t: '4', n: 5}]},
-                { total: 1000, prize: [{a: 'attr', t: 'rmbmoney', n: 2000},{a: 'item', t: '600', n: 20}]},
-                { total: 2000, prize: [{a: 'attr', t: 'rmbmoney', n: 3000},{a: 'item', t: '609', n: 1}]},
-                { total: 3000, prize: [{a: 'attr', t: 'rmbmoney', n: 6000},{a: 'item', t: '611', n: 1}]},
-                { total: 5000, prize: [{a: 'attr', t: 'rmbmoney', n: 10000},{a: 'item', t: '610', n: 1}]}
-            ]
-        },
+                { total: 1000, prize: [{a: 'attr', t: 'rmbmoney', n: 500},{a: 'item', t: '4', n: 2}] },
+                { total: 2000, prize: [{a: 'attr', t: 'rmbmoney', n: 1000},{a: 'item', t: '12', n: 500}]},
+                { total: 5000, prize: [{a: 'attr', t: 'rmbmoney', n: 1500},{a: 'item', t: '4', n: 5}]},
+                { total: 10000, prize: [{a: 'attr', t: 'rmbmoney', n: 2000},{a: 'item', t: '600', n: 20}]},
+                { total: 20000, prize: [{a: 'attr', t: 'rmbmoney', n: 3000},{a: 'item', t: '609', n: 1}]},
+                { total: 30000, prize: [{a: 'attr', t: 'rmbmoney', n: 6000},{a: 'item', t: '611', n: 1}]},
+                { total: 50000, prize: [{a: 'attr', t: 'rmbmoney', n: 10000},{a: 'item', t: '610', n: 1}]}
+				]
+			}
+		},	
+		{
 		"hdid" : 5002,   // 唯一活动id   累计充值
        "htype" : 5,  // 后端唯一识别标识
        "stype" : 500,  // 前端唯一识别标识（看前端需要是否修改）
@ -3065,15 +3069,17 @@
        "showtime" : "仅供参考，会复写正确值",
        "data" : {
            tasks: [
-                { total: 100, prize: [{a: 'attr', t: 'rmbmoney', n: 500},{a: 'item', t: '4', n: 2}] },
-                { total: 200, prize: [{a: 'attr', t: 'rmbmoney', n: 1000},{a: 'item', t: '12', n: 500}]},
-                { total: 500, prize: [{a: 'attr', t: 'rmbmoney', n: 1500},{a: 'item', t: '4', n: 5}]},
-                { total: 1000, prize: [{a: 'attr', t: 'rmbmoney', n: 2000},{a: 'item', t: '600', n: 20}]},
-                { total: 2000, prize: [{a: 'attr', t: 'rmbmoney', n: 3000},{a: 'item', t: '609', n: 1}]},
-                { total: 3000, prize: [{a: 'attr', t: 'rmbmoney', n: 6000},{a: 'item', t: '611', n: 1}]},
-                { total: 5000, prize: [{a: 'attr', t: 'rmbmoney', n: 10000},{a: 'item', t: '610', n: 1}]}
-            ]
-        },
+                { total: 1000, prize: [{a: 'attr', t: 'rmbmoney', n: 500},{a: 'item', t: '4', n: 2}] },
+                { total: 2000, prize: [{a: 'attr', t: 'rmbmoney', n: 1000},{a: 'item', t: '12', n: 500}]},
+                { total: 5000, prize: [{a: 'attr', t: 'rmbmoney', n: 1500},{a: 'item', t: '4', n: 5}]},
+                { total: 10000, prize: [{a: 'attr', t: 'rmbmoney', n: 2000},{a: 'item', t: '600', n: 20}]},
+                { total: 20000, prize: [{a: 'attr', t: 'rmbmoney', n: 3000},{a: 'item', t: '609', n: 1}]},
+                { total: 30000, prize: [{a: 'attr', t: 'rmbmoney', n: 6000},{a: 'item', t: '611', n: 1}]},
+                { total: 50000, prize: [{a: 'attr', t: 'rmbmoney', n: 10000},{a: 'item', t: '610', n: 1}]}
+				]
+			}
+		},	
+		{
 		"hdid" : 5003,   // 唯一活动id   累计充值
        "htype" : 5,  // 后端唯一识别标识
        "stype" : 500,  // 前端唯一识别标识（看前端需要是否修改）
@ -3086,16 +3092,16 @@
        "showtime" : "仅供参考，会复写正确值",
        "data" : {
            tasks: [
-                { total: 100, prize: [{a: 'attr', t: 'rmbmoney', n: 500},{a: 'item', t: '4', n: 2}] },
-                { total: 200, prize: [{a: 'attr', t: 'rmbmoney', n: 1000},{a: 'item', t: '12', n: 500}]},
-                { total: 500, prize: [{a: 'attr', t: 'rmbmoney', n: 1500},{a: 'item', t: '4', n: 5}]},
-                { total: 1000, prize: [{a: 'attr', t: 'rmbmoney', n: 2000},{a: 'item', t: '600', n: 20}]},
-                { total: 2000, prize: [{a: 'attr', t: 'rmbmoney', n: 3000},{a: 'item', t: '609', n: 1}]},
-                { total: 3000, prize: [{a: 'attr', t: 'rmbmoney', n: 6000},{a: 'item', t: '611', n: 1}]},
-                { total: 5000, prize: [{a: 'attr', t: 'rmbmoney', n: 10000},{a: 'item', t: '610', n: 1}]}
-            ]
-        }
-    },
+                { total: 1000, prize: [{a: 'attr', t: 'rmbmoney', n: 500},{a: 'item', t: '4', n: 2}] },
+                { total: 2000, prize: [{a: 'attr', t: 'rmbmoney', n: 1000},{a: 'item', t: '12', n: 500}]},
+                { total: 5000, prize: [{a: 'attr', t: 'rmbmoney', n: 1500},{a: 'item', t: '4', n: 5}]},
+                { total: 10000, prize: [{a: 'attr', t: 'rmbmoney', n: 2000},{a: 'item', t: '600', n: 20}]},
+                { total: 20000, prize: [{a: 'attr', t: 'rmbmoney', n: 3000},{a: 'item', t: '609', n: 1}]},
+                { total: 30000, prize: [{a: 'attr', t: 'rmbmoney', n: 6000},{a: 'item', t: '611', n: 1}]},
+                { total: 50000, prize: [{a: 'attr', t: 'rmbmoney', n: 10000},{a: 'item', t: '610', n: 1}]}
+				]
+			}
+		},
    {
        "hdid" : 6000,   // 唯一活动id   七日登录
        "htype" : 6,  // 后端唯一识别标识
--- a/src/json/item.json
+++ b/src/json/item.json
@ -4029,6 +4029,25 @@
    "payId": "",
    "advancedEffects": ""
  },
+  "50011": {
+    "id": 50011,
+    "name": "playerheadFrame_name_25",
+    "undefined": "使用后解锁头像框“新春安宁”",
+    "type": 7,
+    "sort": 1,
+    "colour": 4,
+    "way": [],
+    "go": "",
+    "icon": "txk_029",
+    "sicon": "txk_029",
+    "describe": "intr_item_describe_50011",
+    "diaoluo": 25,
+    "useNeed": [],
+    "usePrize": [],
+    "selecPrize": [],
+    "payId": "",
+    "advancedEffects": ""
+  },
  "50101": {
    "id": 50101,
    "name": "playerChatFrame_name_6",
@ -4105,6 +4124,25 @@
    "payId": "",
    "advancedEffects": ""
  },
+  "50105": {
+    "id": 50105,
+    "name": "playerChatFrame_name_9",
+    "undefined": "使用后解锁聊天框“新年快乐”",
+    "type": 8,
+    "sort": 1,
+    "colour": 4,
+    "way": [],
+    "go": "",
+    "icon": "lt_dhk15",
+    "sicon": "lt_dhk15",
+    "describe": "intr_item_describe_50105",
+    "diaoluo": 9,
+    "useNeed": [],
+    "usePrize": [],
+    "selecPrize": [],
+    "payId": "",
+    "advancedEffects": ""
+  },
  "50201": {
    "id": 50201,
    "name": "playerheadFrame_name_16",
--- a/src/json/patacom.json
+++ b/src/json/patacom.json
@ -878,5 +878,355 @@
        "n": 1
      }
    ]
+  },
+  "510": {
+    "id": 510,
+    "prize": [
+      {
+        "a": "item",
+        "t": "1",
+        "n": 1020000
+      },
+      {
+        "a": "item",
+        "t": "12",
+        "n": 300
+      }
+    ]
+  },
+  "520": {
+    "id": 520,
+    "prize": [
+      {
+        "a": "item",
+        "t": "1",
+        "n": 1040000
+      },
+      {
+        "a": "item",
+        "t": "12",
+        "n": 300
+      },
+      {
+        "a": "equip",
+        "t": "3009",
+        "n": 1
+      }
+    ]
+  },
+  "530": {
+    "id": 530,
+    "prize": [
+      {
+        "a": "item",
+        "t": "1",
+        "n": 1060000
+      },
+      {
+        "a": "item",
+        "t": "12",
+        "n": 300
+      }
+    ]
+  },
+  "540": {
+    "id": 540,
+    "prize": [
+      {
+        "a": "item",
+        "t": "1",
+        "n": 1080000
+      },
+      {
+        "a": "item",
+        "t": "12",
+        "n": 300
+      },
+      {
+        "a": "equip",
+        "t": "2009",
+        "n": 1
+      }
+    ]
+  },
+  "550": {
+    "id": 550,
+    "prize": [
+      {
+        "a": "item",
+        "t": "1",
+        "n": 1100000
+      },
+      {
+        "a": "item",
+        "t": "12",
+        "n": 300
+      }
+    ]
+  },
+  "560": {
+    "id": 560,
+    "prize": [
+      {
+        "a": "item",
+        "t": "1",
+        "n": 1120000
+      },
+      {
+        "a": "item",
+        "t": "12",
+        "n": 300
+      },
+      {
+        "a": "equip",
+        "t": "1009",
+        "n": 1
+      }
+    ]
+  },
+  "570": {
+    "id": 570,
+    "prize": [
+      {
+        "a": "item",
+        "t": "1",
+        "n": 1140000
+      },
+      {
+        "a": "item",
+        "t": "12",
+        "n": 300
+      }
+    ]
+  },
+  "580": {
+    "id": 580,
+    "prize": [
+      {
+        "a": "item",
+        "t": "1",
+        "n": 1160000
+      },
+      {
+        "a": "item",
+        "t": "12",
+        "n": 300
+      },
+      {
+        "a": "equip",
+        "t": "4003",
+        "n": 1
+      }
+    ]
+  },
+  "590": {
+    "id": 590,
+    "prize": [
+      {
+        "a": "item",
+        "t": "1",
+        "n": 1180000
+      },
+      {
+        "a": "item",
+        "t": "12",
+        "n": 300
+      }
+    ]
+  },
+  "600": {
+    "id": 600,
+    "prize": [
+      {
+        "a": "item",
+        "t": "1",
+        "n": 1200000
+      },
+      {
+        "a": "item",
+        "t": "12",
+        "n": 300
+      },
+      {
+        "a": "equip",
+        "t": "3003",
+        "n": 1
+      }
+    ]
+  },
+  "610": {
+    "id": 610,
+    "prize": [
+      {
+        "a": "item",
+        "t": "1",
+        "n": 1220000
+      },
+      {
+        "a": "item",
+        "t": "12",
+        "n": 300
+      }
+    ]
+  },
+  "620": {
+    "id": 620,
+    "prize": [
+      {
+        "a": "item",
+        "t": "1",
+        "n": 1240000
+      },
+      {
+        "a": "item",
+        "t": "12",
+        "n": 300
+      },
+      {
+        "a": "equip",
+        "t": "2003",
+        "n": 1
+      }
+    ]
+  },
+  "630": {
+    "id": 630,
+    "prize": [
+      {
+        "a": "item",
+        "t": "1",
+        "n": 1260000
+      },
+      {
+        "a": "item",
+        "t": "12",
+        "n": 300
+      }
+    ]
+  },
+  "640": {
+    "id": 640,
+    "prize": [
+      {
+        "a": "item",
+        "t": "1",
+        "n": 1280000
+      },
+      {
+        "a": "item",
+        "t": "12",
+        "n": 300
+      },
+      {
+        "a": "equip",
+        "t": "1003",
+        "n": 1
+      }
+    ]
+  },
+  "650": {
+    "id": 650,
+    "prize": [
+      {
+        "a": "item",
+        "t": "1",
+        "n": 1300000
+      },
+      {
+        "a": "item",
+        "t": "12",
+        "n": 300
+      }
+    ]
+  },
+  "660": {
+    "id": 660,
+    "prize": [
+      {
+        "a": "item",
+        "t": "1",
+        "n": 1320000
+      },
+      {
+        "a": "item",
+        "t": "12",
+        "n": 300
+      },
+      {
+        "a": "equip",
+        "t": "4004",
+        "n": 1
+      }
+    ]
+  },
+  "670": {
+    "id": 670,
+    "prize": [
+      {
+        "a": "item",
+        "t": "1",
+        "n": 1340000
+      },
+      {
+        "a": "item",
+        "t": "12",
+        "n": 300
+      }
+    ]
+  },
+  "680": {
+    "id": 680,
+    "prize": [
+      {
+        "a": "item",
+        "t": "1",
+        "n": 1360000
+      },
+      {
+        "a": "item",
+        "t": "12",
+        "n": 300
+      },
+      {
+        "a": "equip",
+        "t": "3004",
+        "n": 1
+      }
+    ]
+  },
+  "690": {
+    "id": 690,
+    "prize": [
+      {
+        "a": "item",
+        "t": "1",
+        "n": 1380000
+      },
+      {
+        "a": "item",
+        "t": "12",
+        "n": 300
+      }
+    ]
+  },
+  "700": {
+    "id": 700,
+    "prize": [
+      {
+        "a": "item",
+        "t": "1",
+        "n": 1400000
+      },
+      {
+        "a": "item",
+        "t": "12",
+        "n": 300
+      },
+      {
+        "a": "equip",
+        "t": "2004",
+        "n": 1
+      }
+    ]
  }
 }
--- a/src/json/playerChatFrame.json
+++ b/src/json/playerChatFrame.json
@ -133,7 +133,24 @@
    "buff": {
      "defpro": 0.01
    },
-    "colour": 3,
+    "colour": 4,
+    "ani": ""
+  },
+  "9": {
+    "id": 9,
+    "name": "playerChatFrame_name_9",
+    "img": "lt_dhk15",
+    "cond": [
+      "time",
+      -1
+    ],
+    "undefined": "新年庆典获得",
+    "intr": "playerChatFrame_des_9",
+    "sort": 9,
+    "buff": {
+      "defpro": 0.01
+    },
+    "colour": 4,
    "ani": ""
  }
 }
--- a/src/json/playerHeadFrame.json
+++ b/src/json/playerHeadFrame.json
@ -408,5 +408,22 @@
    },
    "colour": 5,
    "ani": ""
+  },
+  "25": {
+    "id": 25,
+    "name": "playerheadFrame_name_25",
+    "undefined": "新年庆典活动获得，解锁后生命加成+1%",
+    "img": "txk_029",
+    "cond": [
+      "time",
+      -1
+    ],
+    "intr": "playerheadFrame_des_25",
+    "sort": 25,
+    "buff": {
+      "hppro": 0.01
+    },
+    "colour": 4,
+    "ani": ""
  }
 }
--- a/src/public/pay.ts
+++ b/src/public/pay.ts
@ -252,6 +252,10 @@ export class PayFun {
            console.log("Christmasfun.payChristmas Error", e);
        }

+        /**
+         * 如果是自选奖励，payArgs里传入自选项，直接发奖
+         * 在check里判断拦截自选项的奖励
+         */
        if (payArgs && payArgs?.htype && payArgs?.selectList) {
            let selectPrize = await G.ioredis.get(`pay:${payId}:${player.uid}`);
            if (selectPrize) {
Author	SHA1	Message	Date
dy	3462540159	Merge branch 'bugfix' into dev # Conflicts: # src/public/pay.ts	2023-12-29 13:53:02 +08:00
dy	f9deacd411	fix 重大bug	2023-12-29 13:51:55 +08:00
ciniao	c2b1a6cb0b	增加cpu调试	2023-12-29 11:57:41 +08:00
dy	7676fc3142	Revert "回滚公用方法" This reverts commit `89af066d12`.	2023-12-29 01:19:47 +08:00
dy	2af3bf426b	Merge branch 'master' into bugfix	2023-12-29 01:19:16 +08:00
dy	89af066d12	回滚公用方法	2023-12-29 01:07:27 +08:00
dy	8dfe0b4ce8	fix 脚本	2023-12-28 23:55:07 +08:00
dy	55fae245e9	fix 脚本模板	2023-12-28 19:49:06 +08:00
dy	ad9e3cca46	Merge branch 'bugfix' into release # Conflicts: # src/public/rank/rank.ts	2023-12-28 19:17:09 +08:00
dy	63877a2664	Merge branch 'bugfix' into release	2023-12-28 17:34:02 +08:00
dy	1a88ed0784	Merge branch 'feature/json' into release	2023-12-28 17:33:54 +08:00
dy	f2b9f12390	huodong.json	2023-12-28 17:33:47 +08:00
dy	9d9c37714b	Merge branch 'bugfix' into release	2023-12-28 16:13:54 +08:00
dy	4343d50f7c	Merge branch 'feature/yuandan' into release	2023-12-28 15:17:35 +08:00
dy	5512bf3422	Merge branch 'feature/json' into release	2023-12-28 15:17:24 +08:00
dy	86595c68b3	cehua json	2023-12-28 15:17:06 +08:00
dy	847a1d03e9	注释	2023-12-28 15:14:42 +08:00
dy	7b5c470f52	fix 红点	2023-12-27 22:31:09 +08:00
dy	757f1ba4b8	Merge branch 'feature/xiaofeijingsai' into release	2023-12-27 21:06:44 +08:00
dy	2309ff4a9c	Merge branch 'feature/json' into release	2023-12-27 20:50:05 +08:00
dy	d6d8b39afe	Merge branch 'feature/json' into release # Conflicts: # src/json/attr.json # src/json/huodong.json5	2023-12-27 20:21:51 +08:00
dy	47f16b583a	Merge branch 'feature/xiaofeijingsai' into release	2023-12-27 20:20:23 +08:00
dy	82d323d5c8	Merge branch 'feature/yuandan' into release # Conflicts: # src/public/pay.ts	2023-12-27 20:20:01 +08:00
dy	dced990c89	Merge remote-tracking branch 'origin/fix_rank' into release	2023-12-27 20:19:25 +08:00