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

Merge branch 'bugfix' into dev

Browse Source
This commit is contained in:
dy 2023-12-28 14:18:58 +08:00
commit e1430b6411
6 changed files with 46 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -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}

109
package-lock.json generated
View File

@ -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"
}
},

3
package.json
View File

@ -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"
}
}

2
src/api_s2c/chat/ApiSend.ts
View File

@ -7,7 +7,7 @@ import { getGud } from "../../public/gud";
export default async function (call: ApiCall<ReqSend, ResSend>) {
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;

4
src/shared/public/hero.ts
View File

@ -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);
}
}

2
src/shared/public/public.ts
View File

@ -116,7 +116,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) {