From b9a556ea3078c2146af7d3bff3f9d38e90e4a53c Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 27 Dec 2023 22:09:53 +0800 Subject: [PATCH 01/15] fix pay --- src/public/pay.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/public/pay.ts b/src/public/pay.ts index fe7e977..d745850 100644 --- a/src/public/pay.ts +++ b/src/public/pay.ts @@ -250,7 +250,7 @@ export class PayFun { console.log("Christmasfun.payChristmas Error", e); } - if (payArgs && payArgs?.htype && payArgs?.selectList) { + if (payArgs && payArgs?.htype) { let selectPrize = await G.ioredis.get(`pay:${payId}:${player.uid}`); if (selectPrize) { prize.push(...JSON.parse(selectPrize)) From 57c5a8a5e7e71f4f1377693ff1377bd527bc5e76 Mon Sep 17 00:00:00 2001 From: dy Date: Wed, 27 Dec 2023 22:56:55 +0800 Subject: [PATCH 02/15] Revert "fix pay" This reverts commit b9a556ea3078c2146af7d3bff3f9d38e90e4a53c. --- src/public/pay.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/public/pay.ts b/src/public/pay.ts index d745850..fe7e977 100644 --- a/src/public/pay.ts +++ b/src/public/pay.ts @@ -250,7 +250,7 @@ export class PayFun { console.log("Christmasfun.payChristmas Error", e); } - if (payArgs && payArgs?.htype) { + if (payArgs && payArgs?.htype && payArgs?.selectList) { let selectPrize = await G.ioredis.get(`pay:${payId}:${player.uid}`); if (selectPrize) { prize.push(...JSON.parse(selectPrize)) From e098e41885efa65afe3e703c1e9d58483750e2cc Mon Sep 17 00:00:00 2001 From: dy Date: Thu, 28 Dec 2023 10:05:52 +0800 Subject: [PATCH 03/15] =?UTF-8?q?paylog=E5=A2=9E=E5=8A=A0args=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/public/pay.ts | 2 ++ src/shared/protocols/pay/PtlGetList.ts | 5 +++++ src/shared/protocols/serviceProto.ts | 12 ++++++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/public/pay.ts b/src/public/pay.ts index fe7e977..f5ad184 100644 --- a/src/public/pay.ts +++ b/src/public/pay.ts @@ -31,6 +31,8 @@ export class PayFun { let obj: payLog = {time: G.time, type: type}; if (conf.time != -1) obj.eTime = time + conf.time; + obj.args = payArgs + if (payId == 'G123SendGift') { obj.popup_id = payArgs.popup_id obj.template_id = payArgs.template_id diff --git a/src/shared/protocols/pay/PtlGetList.ts b/src/shared/protocols/pay/PtlGetList.ts index c492026..1fcd362 100644 --- a/src/shared/protocols/pay/PtlGetList.ts +++ b/src/shared/protocols/pay/PtlGetList.ts @@ -20,6 +20,11 @@ export type payLog = { * @system 系统赠送 */ type: 'user' | 'system' | 'legu'; + /** + * 其他信息 + */ + args?: any; + /** G123 */ popup_id?: string diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 9961fc1..9741f78 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -18199,6 +18199,14 @@ export const serviceProto: ServiceProto = { }, { "id": 3, + "name": "args", + "type": { + "type": "Any" + }, + "optional": true + }, + { + "id": 4, "name": "popup_id", "type": { "type": "String" @@ -18206,7 +18214,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 4, + "id": 5, "name": "buyNumber", "type": { "type": "Number" @@ -18214,7 +18222,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 5, + "id": 6, "name": "template_id", "type": { "type": "String" From 47b1fe4d2285914fccb6006de7e8c4d46d8fe98f Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 28 Dec 2023 10:08:19 +0800 Subject: [PATCH 04/15] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=82=AC=E8=B5=8F?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=80=E9=94=AE=E9=A2=86=E5=8F=96=E7=89=B9?= =?UTF-8?q?=E6=9D=83=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/xstask/ApiAllGet.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api_s2c/xstask/ApiAllGet.ts b/src/api_s2c/xstask/ApiAllGet.ts index d89d696..360b994 100644 --- a/src/api_s2c/xstask/ApiAllGet.ts +++ b/src/api_s2c/xstask/ApiAllGet.ts @@ -48,7 +48,7 @@ export default async function (call: ApiCall) { prizeArr.push(...taskConf.prize) } } - prizeArr.push(...taskConf.prize) + // prizeArr.push(...taskConf.prize) } call.succ({ taskList: await XstaskFun.getAllTask(call.uid), From cae860a0878250af93829c43de37a1398faef09b Mon Sep 17 00:00:00 2001 From: dy Date: Thu, 28 Dec 2023 10:47:38 +0800 Subject: [PATCH 05/15] =?UTF-8?q?tsrpc=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 109 +++++++++++++++++----------------------------- package.json | 3 +- 2 files changed, 40 insertions(+), 72 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7ba4421..b3f1e4b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,6 @@ "axios": "^1.4.0", "crypto-js": "^4.1.1", "express": "^4.18.2", - "heapdump": "^0.3.15", "ioredis": "^5.3.2", "json5": "^2.2.3", "mathjs": "^11.4.0", @@ -21,7 +20,7 @@ "redis": "^4.3.1", "shelljs": "^0.8.5", "sync-request": "^6.1.0", - "tsrpc": "^3.4.12", + "tsrpc": "^3.4.14", "xlsx": "^0.18.5" }, "devDependencies": { @@ -2925,18 +2924,6 @@ "he": "bin/he" } }, - "node_modules/heapdump": { - "version": "0.3.15", - "resolved": "https://registry.npmjs.org/heapdump/-/heapdump-0.3.15.tgz", - "integrity": "sha512-n8aSFscI9r3gfhOcAECAtXFaQ1uy4QSke6bnaL+iymYZ/dWs9cqDqHM+rALfsHUwukUbxsdlECZ0pKmJdQ/4OA==", - "hasInstallScript": true, - "dependencies": { - "nan": "^2.13.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/http-basic": { "version": "8.1.3", "resolved": "https://registry.npmmirror.com/http-basic/-/http-basic-8.1.3.tgz", @@ -3853,11 +3840,6 @@ "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", "dev": true }, - "node_modules/nan": { - "version": "2.18.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz", - "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==" - }, "node_modules/nanoid": { "version": "3.3.1", "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.1.tgz", @@ -5092,12 +5074,12 @@ } }, "node_modules/tsbuffer": { - "version": "2.2.7", - "resolved": "https://registry.npmmirror.com/tsbuffer/-/tsbuffer-2.2.7.tgz", - "integrity": "sha512-WkP6NU14W14Kxa+OtccJ4m9+nY8UZs/DlM3FQzxstBkNGzmNvggN3+2mfIzYO8YDKu6mqYUXgpNg1aqIYcUACw==", + "version": "2.2.8", + "resolved": "https://registry.npmjs.org/tsbuffer/-/tsbuffer-2.2.8.tgz", + "integrity": "sha512-P907NAcy6G2+glFFvxd4oE/j9IXRw7Imi6qXLm6WAYGV1ksJdFrge+86R1pAeRzhcgP9KfvjMcR+miv/HnWZpg==", "dependencies": { "k8w-extend-native": "^1.4.6", - "tsbuffer-validator": "^2.1.1", + "tsbuffer-validator": "^2.1.2", "tslib": "*" } }, @@ -5120,9 +5102,9 @@ "integrity": "sha512-I4+5Xfk7G+D++kXdNnYTeY26WQTaf14C84XQwPKteNmrwxRY3CQCkMqASRiCUqtpOuDn43qmoxuXpT+Vo8Wltg==" }, "node_modules/tsbuffer-validator": { - "version": "2.1.1", - "resolved": "https://registry.npmmirror.com/tsbuffer-validator/-/tsbuffer-validator-2.1.1.tgz", - "integrity": "sha512-12JVltPQjv2hZqfd9TZhTjCyQ0bvtRlTXyczOAaH+CnryWI9Twt0i9ZGaM5fb2QMxW5BOhToOIbwO8opDqpCEg==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/tsbuffer-validator/-/tsbuffer-validator-2.1.2.tgz", + "integrity": "sha512-PrqIYy7aANY7ssr92HJN8ZM+eGc4Qmpvu7nNBv+T2DOAb+eqblKjlDZEhNnzxjs/ddqu9PqPe4Aa+fqYdzo98g==", "dependencies": { "k8w-extend-native": "^1.4.6", "tsbuffer-schema": "^2.2.0", @@ -5130,32 +5112,32 @@ } }, "node_modules/tslib": { - "version": "2.4.0", - "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", + "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" }, "node_modules/tsrpc": { - "version": "3.4.12", - "resolved": "https://registry.npmmirror.com/tsrpc/-/tsrpc-3.4.12.tgz", - "integrity": "sha512-FMa7FdzW7LdhsQ49DxcNegeW4oRJGxqP+3DXbZBvsUHSeL2h6UFCSKmw2TypI2ChDeRGgbo+wt6uJ0upF6fz9Q==", + "version": "3.4.14", + "resolved": "https://registry.npmjs.org/tsrpc/-/tsrpc-3.4.14.tgz", + "integrity": "sha512-v1EHjAbza6kuMMPbVu30zQlx05jy8XOCJciyU0gotwbAlnteS48uqOD9ze6WvOt6xeJwyQW5VyGy14oeBEiJtQ==", "dependencies": { "@types/ws": "^7.4.7", "chalk": "^4.1.2", - "tsbuffer": "^2.2.7", - "tsrpc-base-client": "^2.1.11", + "tsbuffer": "^2.2.8", + "tsrpc-base-client": "^2.1.13", "tsrpc-proto": "^1.4.3", "uuid": "^8.3.2", "ws": "^7.5.9" } }, "node_modules/tsrpc-base-client": { - "version": "2.1.12", - "resolved": "https://registry.npmmirror.com/tsrpc-base-client/-/tsrpc-base-client-2.1.12.tgz", - "integrity": "sha512-7Zsby1dtDQkxzvT/tRMLLnjCqpYpoCwN9Sci9x7iWCBMNHiiBPBoKIIp2nqhlfLF3kxSgemQOGF499Mx3GVQfg==", + "version": "2.1.13", + "resolved": "https://registry.npmjs.org/tsrpc-base-client/-/tsrpc-base-client-2.1.13.tgz", + "integrity": "sha512-oNPOZEJfXkOwqi2wp/j0q55NzA7qJFRpL2IzTEU59PTPRZ5OpbV2wg3VVNK7NTJBOjwPSUH/TNBckWtIVKstKg==", "dependencies": { "k8w-extend-native": "^1.4.6", "tsbuffer": "^2.2.7", - "tslib": "*", + "tslib": "=2.4.1", "tsrpc-proto": "^1.4.3" } }, @@ -7929,14 +7911,6 @@ "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", "dev": true }, - "heapdump": { - "version": "0.3.15", - "resolved": "https://registry.npmjs.org/heapdump/-/heapdump-0.3.15.tgz", - "integrity": "sha512-n8aSFscI9r3gfhOcAECAtXFaQ1uy4QSke6bnaL+iymYZ/dWs9cqDqHM+rALfsHUwukUbxsdlECZ0pKmJdQ/4OA==", - "requires": { - "nan": "^2.13.2" - } - }, "http-basic": { "version": "8.1.3", "resolved": "https://registry.npmmirror.com/http-basic/-/http-basic-8.1.3.tgz", @@ -8655,11 +8629,6 @@ "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", "dev": true }, - "nan": { - "version": "2.18.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz", - "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==" - }, "nanoid": { "version": "3.3.1", "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.1.tgz", @@ -9598,12 +9567,12 @@ } }, "tsbuffer": { - "version": "2.2.7", - "resolved": "https://registry.npmmirror.com/tsbuffer/-/tsbuffer-2.2.7.tgz", - "integrity": "sha512-WkP6NU14W14Kxa+OtccJ4m9+nY8UZs/DlM3FQzxstBkNGzmNvggN3+2mfIzYO8YDKu6mqYUXgpNg1aqIYcUACw==", + "version": "2.2.8", + "resolved": "https://registry.npmjs.org/tsbuffer/-/tsbuffer-2.2.8.tgz", + "integrity": "sha512-P907NAcy6G2+glFFvxd4oE/j9IXRw7Imi6qXLm6WAYGV1ksJdFrge+86R1pAeRzhcgP9KfvjMcR+miv/HnWZpg==", "requires": { "k8w-extend-native": "^1.4.6", - "tsbuffer-validator": "^2.1.1", + "tsbuffer-validator": "^2.1.2", "tslib": "*" } }, @@ -9626,9 +9595,9 @@ "integrity": "sha512-I4+5Xfk7G+D++kXdNnYTeY26WQTaf14C84XQwPKteNmrwxRY3CQCkMqASRiCUqtpOuDn43qmoxuXpT+Vo8Wltg==" }, "tsbuffer-validator": { - "version": "2.1.1", - "resolved": "https://registry.npmmirror.com/tsbuffer-validator/-/tsbuffer-validator-2.1.1.tgz", - "integrity": "sha512-12JVltPQjv2hZqfd9TZhTjCyQ0bvtRlTXyczOAaH+CnryWI9Twt0i9ZGaM5fb2QMxW5BOhToOIbwO8opDqpCEg==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/tsbuffer-validator/-/tsbuffer-validator-2.1.2.tgz", + "integrity": "sha512-PrqIYy7aANY7ssr92HJN8ZM+eGc4Qmpvu7nNBv+T2DOAb+eqblKjlDZEhNnzxjs/ddqu9PqPe4Aa+fqYdzo98g==", "requires": { "k8w-extend-native": "^1.4.6", "tsbuffer-schema": "^2.2.0", @@ -9636,32 +9605,32 @@ } }, "tslib": { - "version": "2.4.0", - "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", + "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" }, "tsrpc": { - "version": "3.4.12", - "resolved": "https://registry.npmmirror.com/tsrpc/-/tsrpc-3.4.12.tgz", - "integrity": "sha512-FMa7FdzW7LdhsQ49DxcNegeW4oRJGxqP+3DXbZBvsUHSeL2h6UFCSKmw2TypI2ChDeRGgbo+wt6uJ0upF6fz9Q==", + "version": "3.4.14", + "resolved": "https://registry.npmjs.org/tsrpc/-/tsrpc-3.4.14.tgz", + "integrity": "sha512-v1EHjAbza6kuMMPbVu30zQlx05jy8XOCJciyU0gotwbAlnteS48uqOD9ze6WvOt6xeJwyQW5VyGy14oeBEiJtQ==", "requires": { "@types/ws": "^7.4.7", "chalk": "^4.1.2", - "tsbuffer": "^2.2.7", - "tsrpc-base-client": "^2.1.11", + "tsbuffer": "^2.2.8", + "tsrpc-base-client": "^2.1.13", "tsrpc-proto": "^1.4.3", "uuid": "^8.3.2", "ws": "^7.5.9" } }, "tsrpc-base-client": { - "version": "2.1.12", - "resolved": "https://registry.npmmirror.com/tsrpc-base-client/-/tsrpc-base-client-2.1.12.tgz", - "integrity": "sha512-7Zsby1dtDQkxzvT/tRMLLnjCqpYpoCwN9Sci9x7iWCBMNHiiBPBoKIIp2nqhlfLF3kxSgemQOGF499Mx3GVQfg==", + "version": "2.1.13", + "resolved": "https://registry.npmjs.org/tsrpc-base-client/-/tsrpc-base-client-2.1.13.tgz", + "integrity": "sha512-oNPOZEJfXkOwqi2wp/j0q55NzA7qJFRpL2IzTEU59PTPRZ5OpbV2wg3VVNK7NTJBOjwPSUH/TNBckWtIVKstKg==", "requires": { "k8w-extend-native": "^1.4.6", "tsbuffer": "^2.2.7", - "tslib": "*", + "tslib": "=2.4.1", "tsrpc-proto": "^1.4.3" } }, diff --git a/package.json b/package.json index d55ec03..101642e 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,6 @@ "axios": "^1.4.0", "crypto-js": "^4.1.1", "express": "^4.18.2", - "heapdump": "^0.3.15", "ioredis": "^5.3.2", "json5": "^2.2.3", "mathjs": "^11.4.0", @@ -47,7 +46,7 @@ "redis": "^4.3.1", "shelljs": "^0.8.5", "sync-request": "^6.1.0", - "tsrpc": "^3.4.12", + "tsrpc": "^3.4.14", "xlsx": "^0.18.5" } } From ee991be3b9206a4e347b1022ec471af13ef4252c Mon Sep 17 00:00:00 2001 From: dy Date: Thu, 28 Dec 2023 10:56:54 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E5=BC=83=E7=94=A8=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9A=84tsbuffer-validator/index.js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d6f9983..ef4d2d4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,6 +11,6 @@ WORKDIR /app RUN npm config set registry http://registry.npm.taobao.org/ && npm install pm2@5.2.2 -g -RUN rm -rf node_modules/tsbuffer-validator/index.js && cp tsbufferIndex.js node_modules/tsbuffer-validator/index.js +#RUN rm -rf node_modules/tsbuffer-validator/index.js && cp tsbufferIndex.js node_modules/tsbuffer-validator/index.js CMD cd /app && sh zoeninfo.sh "Asia/Tokyo" && pm2-runtime start js_pm2.config.js -- ${Param} From 4fc0aa8576f487c94d6c65d8ee1028663fab6f49 Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 28 Dec 2023 11:11:13 +0800 Subject: [PATCH 07/15] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=82=AC?= =?UTF-8?q?=E8=B5=8F=E4=BB=BB=E5=8A=A1=E4=B8=80=E9=94=AE=E9=A2=86=E5=8F=96?= =?UTF-8?q?3=E5=80=8D=E5=A5=96=E5=8A=B1=E9=80=BB=E8=BE=91=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/xstask/ApiAllGet.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/api_s2c/xstask/ApiAllGet.ts b/src/api_s2c/xstask/ApiAllGet.ts index 360b994..71e2ebe 100644 --- a/src/api_s2c/xstask/ApiAllGet.ts +++ b/src/api_s2c/xstask/ApiAllGet.ts @@ -38,9 +38,7 @@ export default async function (call: ApiCall) { } // XstaskFun.delTask(call.uid, task._id); XstaskFun.changeInfo(call.uid, change); - await PlayerFun.sendPrize(call, taskConf.prize); HongDianChange.sendChangeKey(call.uid, ['xstaskhd', 'huodonghd']); - if (!tequan) { prizeArr.push(...taskConf.prize) } else { @@ -50,6 +48,7 @@ export default async function (call: ApiCall) { } // prizeArr.push(...taskConf.prize) } + if (prizeArr.length > 0) await PlayerFun.sendPrize(call, prizeArr); call.succ({ taskList: await XstaskFun.getAllTask(call.uid), prize: PublicShared.mergePrize(prizeArr) From d6e41758f9e67472c744217c3f88ce64201261e1 Mon Sep 17 00:00:00 2001 From: xcy Date: Thu, 28 Dec 2023 11:49:21 +0800 Subject: [PATCH 08/15] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BB=88?= =?UTF-8?q?=E8=BA=AB=E5=8D=A1=E6=AF=8F=E5=91=A8=E5=A5=96=E5=8A=B1=E6=9C=AA?= =?UTF-8?q?=E5=8F=91=E6=94=BEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/public/scheduler/scheduler_newDay.ts | 42 +++++++++++++++++++----- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/src/public/scheduler/scheduler_newDay.ts b/src/public/scheduler/scheduler_newDay.ts index 59240aa..fa4d813 100644 --- a/src/public/scheduler/scheduler_newDay.ts +++ b/src/public/scheduler/scheduler_newDay.ts @@ -1,8 +1,9 @@ import { Scheduler, schedulerType } from './scheduler'; -import {PublicShared} from "../../shared/public/public"; -import {Wjjl} from "../../module/collection_wjjl"; -import {ZhanLingTasks} from "../zhanling"; +import { PublicShared } from "../../shared/public/public"; +import { Wjjl } from "../../module/collection_wjjl"; +import { ZhanLingTasks } from "../zhanling"; import { setGud } from '../gud'; +import { EmailFun } from '../email'; export class SchedulerNewDayLocalCtor extends Scheduler { @@ -23,8 +24,8 @@ export class SchedulerNewDayLocalCtor extends Scheduler { async start() { let users = Object.values(G.server.uid_connections) - if(users.length) { - for (let item of users){ + if (users.length) { + for (let item of users) { let gud = item.gud let add: k_v = {}; //每天首次登陆 @@ -36,23 +37,46 @@ export class SchedulerNewDayLocalCtor extends Scheduler { if (gud.logoutTime && PublicShared.getToWeekMondayZeroTime(gud.logoutTime) < PublicShared.getToWeekMondayZeroTime(G.time)) { ZhanLingTasks.clearLog(gud.uid, 'week'); } - G.emit('FIRST_LOGIN_EVERY_DAY', gud, G.time - 24 * 3600, G.time); + G.emit('FIRST_LOGIN_EVERY_DAY', gud, gud.loginTime, G.time); } gud.loginTime = G.time; add.loginTime = G.time; if (Object.keys(add).length > 0) { - G.mongodb.collection('user').updateOne({ bindUid: gud.bindUid,sid:gud.sid }, { + G.mongodb.collection('user').updateOne({ bindUid: gud.bindUid, sid: gud.sid }, { $set: { ...add } }); - setGud(gud.uid,add); + setGud(gud.uid, add); } G.server.sendMsgByUid(gud.uid, 'msg_s2c/PlayerChange', gud) } - G.server.broadcastClusterMsg('msg_s2c/NewDay', {time: this.zeroTime}); + G.server.broadcastClusterMsg('msg_s2c/NewDay', { time: this.zeroTime }); } + + (async () => { + // 每周一，发放终身卡 + if (PublicShared.getWeek(G.time) != 1) return; + + let logs = await G.mongodb.collection("payLogNew").find( + { key: "zhongshengka", del_time: { $exists: false } }, { projection: { _id: 0, } } + ).toArray(); + + let con = G.gc.payEmail.zhongshenka.filter(e => e.day == 7)[0]; + for (let i = 0; i < logs.length; i++) { + // 发送邮件 + EmailFun.addEmail({ + uid: logs[i].uid, + type: con.type, + title: con.title, + content: con.content, + contentInsertArr: [], + createTime: G.time, + prize:con.prize, + }) + } + })() } } From 07fa117614f4fdba9fe7aca8cdf1e2ac7c30a876 Mon Sep 17 00:00:00 2001 From: dy Date: Thu, 28 Dec 2023 13:39:28 +0800 Subject: [PATCH 09/15] =?UTF-8?q?fix=E5=85=AC=E5=85=B1=E6=96=B9=E6=B3=95?= =?UTF-8?q?=20random?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/shared/public/public.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/public/public.ts b/src/shared/public/public.ts index 02c3aa2..5c8d5b6 100644 --- a/src/shared/public/public.ts +++ b/src/shared/public/public.ts @@ -115,7 +115,7 @@ export class PublicShared { * 随机生成区间范围整数 */ static randomNum(min: number, max: number) { - return Math.floor(Math.random() * (max - min) + min); + return Math.floor(Math.random() * (max - min + 1) + min); } /**获取道具配置 */ static getAtnConf(atn: prizeType) { From 27d7a56d10132a84f4792bbfd227251f54058304 Mon Sep 17 00:00:00 2001 From: xcy Date: Thu, 28 Dec 2023 13:44:35 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E7=B4=AF=E8=AE=A1=E5=85=85=E5=80=BC?= =?UTF-8?q?=E7=B4=AF=E8=AE=A1=E9=87=91=E9=A2=9D=E4=BF=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E7=B4=AF=E8=AE=A1vip=E7=BB=8F=E9=AA=8C(=E9=87=91=E9=A2=9D*10)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/event/leijichongzhi/ApiOpen.ts | 2 +- src/api_s2c/event/leijichongzhi/ApiRec.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api_s2c/event/leijichongzhi/ApiOpen.ts b/src/api_s2c/event/leijichongzhi/ApiOpen.ts index 4aac3ce..9d3779f 100644 --- a/src/api_s2c/event/leijichongzhi/ApiOpen.ts +++ b/src/api_s2c/event/leijichongzhi/ApiOpen.ts @@ -26,7 +26,7 @@ export default async function (call: ApiCall) { call.succ({ sTime: sTime, recIndex: db?.recIndex || [], - payNum: await PayFun.getPayDaysAllPayNum(call.uid, _hdinfo.stime, _hdinfo.rtime), + payNum: (await PayFun.getPayDaysAllPayNum(call.uid, _hdinfo.stime, _hdinfo.rtime)) * 10, hdinfo: _hdinfo }); } \ No newline at end of file diff --git a/src/api_s2c/event/leijichongzhi/ApiRec.ts b/src/api_s2c/event/leijichongzhi/ApiRec.ts index 77aa2ee..39d27ee 100644 --- a/src/api_s2c/event/leijichongzhi/ApiRec.ts +++ b/src/api_s2c/event/leijichongzhi/ApiRec.ts @@ -20,7 +20,7 @@ export default async function (call: ApiCall) { let db = await G.mongodb.cEvent(_dbType).findOne({ uid: call.uid, type: _dbType }); if (db.recIndex.includes(call.req.index)) return call.error('', { code: -2 }); - let payNum = await PayFun.getPayDaysAllPayNum(call.uid, _hdinfo.stime, _hdinfo.rtime); + let payNum = (await PayFun.getPayDaysAllPayNum(call.uid, _hdinfo.stime, _hdinfo.rtime)) * 10; if (payNum < conf.total) return call.error('', { code: -3 }); await PlayerFun.sendPrize(call, conf.prize); From 4e19dc21a150112d5b2f013c40d8c6c40e979835 Mon Sep 17 00:00:00 2001 From: dy Date: Thu, 28 Dec 2023 14:18:26 +0800 Subject: [PATCH 11/15] =?UTF-8?q?fix=E8=81=8A=E5=A4=A9=E7=A6=81=E8=A8=80?= =?UTF-8?q?=EF=BC=8C=E8=8B=B1=E9=9B=84=E9=98=B5=E5=BD=A2=E6=88=98=E5=8A=9B?= =?UTF-8?q?=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/chat/ApiSend.ts | 2 +- src/shared/public/hero.ts | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/api_s2c/chat/ApiSend.ts b/src/api_s2c/chat/ApiSend.ts index a081f7d..4d182d0 100644 --- a/src/api_s2c/chat/ApiSend.ts +++ b/src/api_s2c/chat/ApiSend.ts @@ -7,7 +7,7 @@ import { getGud } from "../../public/gud"; export default async function (call: ApiCall) { - let status_chat = await getGud(call.uid)['status_chat']; + let status_chat = (await getGud(call.uid))['status_chat']; // 验证是否被禁言 if(status_chat == 1) return call.error(lng.chat_4); let data = call.req; diff --git a/src/shared/public/hero.ts b/src/shared/public/hero.ts index 8869338..dbddc83 100644 --- a/src/shared/public/hero.ts +++ b/src/shared/public/hero.ts @@ -238,7 +238,9 @@ export class HeroShared { let find = Object.entries(posObj).find(v => v[1] == hero._id); if (find) { - let __buff = G.gc.fightPlan[select][lv].buff[Number(find[0]) - 1]; + let maxLv = R.values(G.gc.fightPlan[select]).length - 1 + let fixLv = lv > maxLv ? maxLv : lv + let __buff = G.gc.fightPlan[select][fixLv].buff[Number(find[0]) - 1]; __buff && PublicShared.mergeProperty(buff, __buff); } } From 075c60a9f83f29767f70fbde43af5064fbcda0e4 Mon Sep 17 00:00:00 2001 From: xcy Date: Thu, 28 Dec 2023 14:42:45 +0800 Subject: [PATCH 12/15] =?UTF-8?q?fix:=20=E7=BB=88=E8=BA=AB=E5=8D=A1?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=99=A8log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/public/scheduler/scheduler_newDay.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/public/scheduler/scheduler_newDay.ts b/src/public/scheduler/scheduler_newDay.ts index fa4d813..b213215 100644 --- a/src/public/scheduler/scheduler_newDay.ts +++ b/src/public/scheduler/scheduler_newDay.ts @@ -58,14 +58,21 @@ export class SchedulerNewDayLocalCtor extends Scheduler { (async () => { // 每周一，发放终身卡 - if (PublicShared.getWeek(G.time) != 1) return; + if (PublicShared.getWeek(G.time) != 1) { + console.log("不是周一，不发放终身卡", PublicShared.getWeek(G.time)); + return + }; let logs = await G.mongodb.collection("payLogNew").find( { key: "zhongshengka", del_time: { $exists: false } }, { projection: { _id: 0, } } ).toArray(); + if (logs.length == 0) { + console.log("没有终身卡数据，不发放终身卡"); + } let con = G.gc.payEmail.zhongshenka.filter(e => e.day == 7)[0]; for (let i = 0; i < logs.length; i++) { + console.log("发放终身卡", logs[i].uid); // 发送邮件 EmailFun.addEmail({ uid: logs[i].uid, From 96729c719a76dfeee74f41dad2a84ed7bab0caf9 Mon Sep 17 00:00:00 2001 From: xcy Date: Thu, 28 Dec 2023 14:48:52 +0800 Subject: [PATCH 13/15] =?UTF-8?q?fix:=20=E7=BB=88=E8=BA=AB=E5=8D=A1?= =?UTF-8?q?=E5=8F=91=E6=94=BE=E5=A5=96=E5=8A=B1bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/public/scheduler/scheduler_newDay.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/public/scheduler/scheduler_newDay.ts b/src/public/scheduler/scheduler_newDay.ts index b213215..585a265 100644 --- a/src/public/scheduler/scheduler_newDay.ts +++ b/src/public/scheduler/scheduler_newDay.ts @@ -64,7 +64,7 @@ export class SchedulerNewDayLocalCtor extends Scheduler { }; let logs = await G.mongodb.collection("payLogNew").find( - { key: "zhongshengka", del_time: { $exists: false } }, { projection: { _id: 0, } } + { key: "zhongshenka", del_time: { $exists: false } }, { projection: { _id: 0, } } ).toArray(); if (logs.length == 0) { From bf4f22d092803345fd902c325f1993f510214f26 Mon Sep 17 00:00:00 2001 From: xcy Date: Thu, 28 Dec 2023 15:18:47 +0800 Subject: [PATCH 14/15] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BB=88?= =?UTF-8?q?=E8=BA=AB=E5=8D=A1=E9=82=AE=E4=BB=B6=E6=B2=A1=E6=9C=89type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/public/scheduler/scheduler_newDay.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/public/scheduler/scheduler_newDay.ts b/src/public/scheduler/scheduler_newDay.ts index 585a265..4ca793b 100644 --- a/src/public/scheduler/scheduler_newDay.ts +++ b/src/public/scheduler/scheduler_newDay.ts @@ -76,7 +76,7 @@ export class SchedulerNewDayLocalCtor extends Scheduler { // 发送邮件 EmailFun.addEmail({ uid: logs[i].uid, - type: con.type, + type: "system", title: con.title, content: con.content, contentInsertArr: [], From 37f2472f5d1ad4d287c6c25d1a3694a04bee4ac3 Mon Sep 17 00:00:00 2001 From: dy Date: Thu, 28 Dec 2023 16:10:56 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=EF=BC=8C=E5=88=B7=E6=96=B0=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/fix_patch/patch_hdinfo.ts | 79 +++++++++++++++++++++++++++++++++++ src/patch.ts | 2 +- 2 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 src/fix_patch/patch_hdinfo.ts diff --git a/src/fix_patch/patch_hdinfo.ts b/src/fix_patch/patch_hdinfo.ts new file mode 100644 index 0000000..fad15cc --- /dev/null +++ b/src/fix_patch/patch_hdinfo.ts @@ -0,0 +1,79 @@ +import {patchFun, patchInit} from "../patch"; + +class Path { + @patchFun + async fun1(a: any) { + //这里执行脚本的内容，加了patchFun的函数，不允许重复执行 + console.log("这是第1个脚本里内容"); + + let _hd = G.gc.huodong.find(i => i.hdid == 4000) + + if (!_hd) { + console.log('htype4没查到活动') + return + } + + await G.mongodb.collection('hdinfo').findOneAndUpdate({hdid: 4000}, {$set: {data: _hd.data}}) + + console.log('这是第1个脚本执行完成') + + return 12 + } + + @patchFun + async fun2(a: any) { + //这里执行脚本的内容，加了patchFun的函数，不允许重复执行 + console.log("这是第2个脚本里内容"); + + let _hd = G.gc.huodong.find(i => i.htype == 2) + + if (!_hd) { + console.log('htype2没查到活动') + return + } + + await G.mongodb.collection('hdinfo').updateMany({htype: 2}, {$set: {data: _hd.data}}) + + console.log('这是第2个脚本执行完成') + + return 12 + } + + @patchFun + async fun3(a: any) { + //这里执行脚本的内容，加了patchFun的函数，不允许重复执行 + console.log("这是第3个脚本里内容"); + + let _hd = G.gc.huodong.find(i => i.htype == 5) + + if (!_hd) { + console.log('htype5没查到活动') + return + } + + await G.mongodb.collection('hdinfo').updateMany({htype: 5}, {$set: {data: _hd.data}}) + + console.log('这是第3个脚本执行完成') + + return 12 + } + + + async run() { + await this.fun1(1); + await this.fun2(2); + await this.fun3(3); + } +} + +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("逻辑执行完成，等待退出"); +} + +main(); diff --git a/src/patch.ts b/src/patch.ts index c5b3d7a..f572823 100644 --- a/src/patch.ts +++ b/src/patch.ts @@ -15,7 +15,7 @@ export function patchFun(target: any, key: string, descriptor: PropertyDescripto throw new Error(); } catch (e) { let caller = (e.stack.split("\n").slice(2)[0].split("\\").slice(-2)); - scriptName = caller[1].split(':')[0]; + scriptName = caller[0].split('(')[1].split(':')[0]; } if(!scriptName){