qixin/HJ_Server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: qixin:3462540159813a5c0087e89595eea7843fc1e12c
Branches Tags
qixin:dev
qixin:release
qixin:bugfix
qixin:feature/skin
qixin:feature/huangqijiuguan
qixin:master
qixin:feature/pushgift
qixin:feature/weiwang
qixin:feature/warning
qixin:feature/leichong
qixin:feature/xiaofeijingsai
..
compare: qixin:52a112085b8398e463624cf0f5e1d3b5abdf7f35
Branches Tags
qixin:dev
qixin:release
qixin:bugfix
qixin:feature/skin
qixin:feature/huangqijiuguan
qixin:master
qixin:feature/pushgift
qixin:feature/weiwang
qixin:feature/warning
qixin:feature/leichong
qixin:feature/xiaofeijingsai

No commits in common. "3462540159813a5c0087e89595eea7843fc1e12c" and "52a112085b8398e463624cf0f5e1d3b5abdf7f35" have entirely different histories.
3462540159 ... 52a112085b

14 changed files with 58 additions and 4634 deletions
Show Stats Expand all files Collapse all files

4050
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

1
package.json
View File

@ -37,7 +37,6 @@
"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",

22
src/api_o2s/games/Apiheapdump.ts
View File

@ -1,8 +1,6 @@
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>) {
@ -22,24 +20,4 @@ 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"
})
}
}

6
src/api_s2c/hongdian/fun.ts
View File

@ -396,12 +396,6 @@ 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}
}

7
src/fix_patch/patch_hdinfo_20231228.ts
View File

@ -72,11 +72,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();

45
src/fix_patch/patch_rank_delData.ts
View File

@ -1,45 +0,0 @@
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();

7
src/fix_patch/patch_test.ts
View File

@ -25,10 +25,9 @@ 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();

42
src/json/g123item.json
View File

@ -7139,27 +7139,6 @@
"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": "冰天雪地",
@ -7244,27 +7223,6 @@
"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": "招贤纳士",

84
src/json/huodong.json5
View File

@ -2672,7 +2672,7 @@
{
a: 'item',
t: '49',
n: 4,
n: 6,
p: 10,
s: 3600
}
@ -2733,7 +2733,7 @@
{
a: 'item',
t: '49',
n: 4,
n: 6,
p: 10,
s: 3600
}
@ -3023,17 +3023,15 @@
"showtime" : "仅供参考，会复写正确值",
"data" : {
tasks: [
{ 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}]}
]
}
},
{
{ 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}]}
]
},
"hdid" : 5001, // 唯一活动id 累计充值
"htype" : 5, // 后端唯一识别标识
"stype" : 500, // 前端唯一识别标识（看前端需要是否修改）
@ -3046,17 +3044,15 @@
"showtime" : "仅供参考，会复写正确值",
"data" : {
tasks: [
{ 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}]}
]
}
},
{
{ 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}]}
]
},
"hdid" : 5002, // 唯一活动id 累计充值
"htype" : 5, // 后端唯一识别标识
"stype" : 500, // 前端唯一识别标识（看前端需要是否修改）
@ -3069,17 +3065,15 @@
"showtime" : "仅供参考，会复写正确值",
"data" : {
tasks: [
{ 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}]}
]
}
},
{
{ 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}]}
]
},
"hdid" : 5003, // 唯一活动id 累计充值
"htype" : 5, // 后端唯一识别标识
"stype" : 500, // 前端唯一识别标识（看前端需要是否修改）
@ -3092,16 +3086,16 @@
"showtime" : "仅供参考，会复写正确值",
"data" : {
tasks: [
{ 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}]}
]
}
},
{ 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}]}
]
}
},
{
"hdid" : 6000, // 唯一活动id 七日登录
"htype" : 6, // 后端唯一识别标识

38
src/json/item.json
View File

@ -4029,25 +4029,6 @@
"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",
@ -4124,25 +4105,6 @@
"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",

350
src/json/patacom.json
View File

@ -878,355 +878,5 @@
"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
}
]
}
}

19
src/json/playerChatFrame.json
View File

@ -133,24 +133,7 @@
"buff": {
"defpro": 0.01
},
"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,
"colour": 3,
"ani": ""
}
}

17
src/json/playerHeadFrame.json
View File

@ -408,22 +408,5 @@
},
"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": ""
}
}

4
src/public/pay.ts
View File

@ -252,10 +252,6 @@ 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) {