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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
xcy 2023-12-21 14:01:16 +08:00
commit f725816c20
17 changed files with 1816 additions and 415 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -11,4 +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
CMD cd /app && sh zoeninfo.sh "Asia/Tokyo" && pm2-runtime start js_pm2.config.js -- ${Param}

6
package.json
View File

@ -6,9 +6,9 @@
"private": true,
"scripts": {
"dev": "tsrpc-cli dev",
"build": "tsrpc-cli build && copy js_pm2.config.js dist && copy zoeninfo.sh dist && mkdir dist\\json && xcopy src\\json dist\\json /e ",
"build_win": "tsrpc-cli build && copy js_pm2.config.js dist && copy zoeninfo.sh dist && mkdir dist\\json && xcopy src\\json dist\\json /e ",
"build_linux": "tsrpc-cli build && cp js_pm2.config.js dist && cp zoeninfo.sh dist && cp src/json/ -a dist ",
"build": "tsrpc-cli build && copy js_pm2.config.js dist && copy zoeninfo.sh dist && copy tsbufferIndex.js dist && mkdir dist\\json && xcopy src\\json dist\\json /e ",
"build_win": "tsrpc-cli build && copy js_pm2.config.js dist && copy zoeninfo.sh dist && copy tsbufferIndex.js dist && mkdir dist\\json && xcopy src\\json dist\\json /e ",
"build_linux": "tsrpc-cli build && cp js_pm2.config.js dist && cp zoeninfo.sh dist && cp tsbufferIndex.js dist && cp src/json/ -a dist ",
"build_docker_win": "npm run build_win && cd dist && npm i --omit=dev",
"build_docker_linux": "npm run build_linux && cd dist && npm i --omit=dev",
"doc": "tsrpc-cli doc && node js_uploadDoc.js",

13
src/api_s2c/item/ApiUse.ts
View File

@ -6,7 +6,7 @@ import {PublicShared} from '../../shared/public/public';
import {TanXianShared} from '../../shared/public/tanxian';
import {event_dldh_addPrize} from '../event/diaoluoduihuan/ApiOpen';
import {getEventPrize} from '../tanxian/ApiEvent';
import { getItemByItemId } from "../../public/item";
import {getItemByItemId} from "../../public/item";
const iType = {
3: 'hero',
@ -15,10 +15,10 @@ const iType = {
};
export default async function (call: ApiCall<ReqUse, ResUse>) {
//ȥ<><C8A5>item Redis<69><73><EFBFBD>
let itemInfo = await getItemByItemId(call.uid,call.req.itemId); //call.conn.item[call.req.itemId];
if(!itemInfo[call.req.itemId]) return call.error(globalThis.lng.item_1);
//ȥ<><C8A5>item Redis<69><73><EFBFBD>
let itemInfo = await getItemByItemId(call.uid, call.req.itemId); //call.conn.item[call.req.itemId];
if (!itemInfo[call.req.itemId]) return call.error(globalThis.lng.item_1);
let item = itemInfo[call.req.itemId];
let useNum = call.req.useNum;
@ -105,8 +105,9 @@ export default async function (call: ApiCall<ReqUse, ResUse>) {
n: useNum
}
];
} else if ([7, 8].includes(itemConf.type)) {
} else if ([6, 7, 8].includes(itemConf.type)) {
if (useNum > item.num) return call.error(globalThis.lng.item_3);
if (itemConf.type == 6) UserFun.activeModel(call.uid, itemConf.diaoluo.toString(), useNum);
if (itemConf.type == 7) UserFun.activeHeadFrame(call.uid, itemConf.diaoluo.toString(), useNum);
if (itemConf.type == 8) UserFun.activeChatFrame(call.uid, itemConf.diaoluo.toString(), useNum);

14
src/api_s2c/user/ApiChangeInfo.ts
View File

@ -6,13 +6,15 @@ import {UserShared} from '../../shared/public/user';
export default async function (call: ApiCall<ReqChangeInfo, ResChangeInfo>) {
if (call.req.type == 'model' && !call.req.pos) return call.error(globalThis.lng.shiwu_6);
// if (call.req.type == 'model' && !call.req.pos) return call.error(globalThis.lng.shiwu_6);
const active = (await G.mongodb.collection('playerInfo', 'playerInfo').findOne({
let active = (await G.mongodb.collection('playerInfo', 'playerInfo').findOne({
uid: call.uid,
type: 'playerInfo'
}))?.active || {};
const fmtId = UserShared.getInfoId(call.req.type, call.req.id, call.req.pos || '');
const fmtId = UserShared.getInfoId(call.req.type, call.req.id);
if (R.values(active).length == 0) active = UserShared.getActive(fmtId, call.conn.gud, call.req.type, call.req.id)
const isMeet = UserShared.chechIsActive(fmtId, {
lv: call.conn.gud.lv,
vip: call.conn.gud.vip,
@ -27,10 +29,12 @@ export default async function (call: ApiCall<ReqChangeInfo, ResChangeInfo>) {
if (call.req.type == 'model') {
let d = JSON.parse(JSON.stringify(call.conn.gud.model));
d[call.req.pos] = {
let changeItem = {
id: call.req.id,
time: active[fmtId] || -1
};
}
d[call.req.id] = changeItem
change.upModel = changeItem
change.model = d;
} else {
change[call.req.type] = {

85
src/cross/protocols/serviceProto.ts
View File

@ -875,6 +875,29 @@ export const serviceProto: ServiceProto<ServiceType> = {
},
{
"id": 5,
"name": "upModel",
"type": {
"type": "Interface",
"properties": [
{
"id": 0,
"name": "id",
"type": {
"type": "String"
}
},
{
"id": 1,
"name": "time",
"type": {
"type": "Number"
}
}
]
}
},
{
"id": 6,
"name": "model",
"type": {
"type": "Interface",
@ -903,14 +926,14 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 6,
"id": 7,
"name": "renown",
"type": {
"type": "Number"
}
},
{
"id": 7,
"id": 8,
"name": "wxcLv",
"type": {
"type": "Interface",
@ -936,14 +959,14 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 8,
"id": 9,
"name": "mapId",
"type": {
"type": "Number"
}
},
{
"id": 9,
"id": 10,
"name": "shoucangping",
"type": {
"type": "Interface",
@ -956,14 +979,14 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 10,
"id": 11,
"name": "useTujianLvPoint",
"type": {
"type": "Number"
}
},
{
"id": 11,
"id": 12,
"name": "skills",
"type": {
"type": "Interface",
@ -976,7 +999,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 12,
"id": 13,
"name": "fightSkills",
"type": {
"type": "Interface",
@ -989,7 +1012,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 13,
"id": 14,
"name": "heroPos",
"type": {
"type": "Interface",
@ -1002,21 +1025,21 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 14,
"id": 15,
"name": "ghId",
"type": {
"type": "String"
}
},
{
"id": 15,
"id": 16,
"name": "ghName",
"type": {
"type": "String"
}
},
{
"id": 16,
"id": 17,
"name": "ghLevel",
"type": {
"type": "Reference",
@ -1024,7 +1047,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 17,
"id": 18,
"name": "ghwz",
"type": {
"type": "Interface",
@ -1038,7 +1061,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 18,
"id": 19,
"name": "ghExitTime",
"type": {
"type": "Number"
@ -1046,7 +1069,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 19,
"id": 20,
"name": "loginTime",
"type": {
"type": "Number"
@ -1054,7 +1077,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 20,
"id": 21,
"name": "logoutTime",
"type": {
"type": "Number"
@ -1062,7 +1085,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 21,
"id": 22,
"name": "cTime",
"type": {
"type": "Number"
@ -1070,7 +1093,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 22,
"id": 23,
"name": "loginDays",
"type": {
"type": "Number"
@ -1078,7 +1101,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 23,
"id": 24,
"name": "serverName",
"type": {
"type": "String"
@ -1086,7 +1109,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 24,
"id": 25,
"name": "sid",
"type": {
"type": "Number"
@ -1094,7 +1117,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 25,
"id": 26,
"name": "onlineTime",
"type": {
"type": "Number"
@ -1102,7 +1125,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 26,
"id": 27,
"name": "newonlinetime",
"type": {
"type": "Number"
@ -1110,7 +1133,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 27,
"id": 28,
"name": "isNpc",
"type": {
"type": "Boolean"
@ -1118,7 +1141,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 28,
"id": 29,
"name": "matrix",
"type": {
"type": "Interface",
@ -1132,7 +1155,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 29,
"id": 30,
"name": "matrixPos",
"type": {
"type": "Interface",
@ -1152,7 +1175,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 30,
"id": 31,
"name": "selectMatrix",
"type": {
"type": "String"
@ -1160,7 +1183,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 31,
"id": 32,
"name": "fightHeros",
"type": {
"type": "Array",
@ -1171,7 +1194,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 32,
"id": 33,
"name": "helpHeros",
"type": {
"type": "Array",
@ -1248,7 +1271,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 33,
"id": 34,
"name": "changeNameNum",
"type": {
"type": "Number"
@ -1256,7 +1279,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 34,
"id": 35,
"name": "peijianUnlock",
"type": {
"type": "Interface",
@ -1270,7 +1293,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 35,
"id": 36,
"name": "headFrames",
"type": {
"type": "Interface",
@ -1284,7 +1307,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 36,
"id": 37,
"name": "chatFrames",
"type": {
"type": "Interface",

44
src/json/item.json
View File

@ -3860,6 +3860,7 @@
"way": [],
"go": "",
"icon": "txk_019",
"sicon": "txk_019",
"describe": "intr_item_describe_50001",
"diaoluo": 3,
"useNeed": [],
@ -3878,6 +3879,7 @@
"way": [],
"go": "",
"icon": "txk_016",
"sicon": "txk_016",
"describe": "intr_item_describe_50002",
"diaoluo": 4,
"useNeed": [],
@ -3896,6 +3898,7 @@
"way": [],
"go": "",
"icon": "txk_023",
"sicon": "txk_023",
"describe": "intr_item_describe_50003",
"diaoluo": 6,
"useNeed": [],
@ -3914,6 +3917,7 @@
"way": [],
"go": "",
"icon": "txk_009",
"sicon": "txk_009",
"describe": "intr_item_describe_50004",
"diaoluo": 7,
"useNeed": [],
@ -3932,6 +3936,7 @@
"way": [],
"go": "",
"icon": "txk_026",
"sicon": "txk_026",
"describe": "intr_item_describe_50005",
"diaoluo": 8,
"useNeed": [],
@ -3950,6 +3955,7 @@
"way": [],
"go": "",
"icon": "txk_018",
"sicon": "txk_018",
"describe": "intr_item_describe_50006",
"diaoluo": 9,
"useNeed": [],
@ -3968,6 +3974,7 @@
"way": [],
"go": "",
"icon": "txk_014",
"sicon": "txk_014",
"describe": "intr_item_describe_50007",
"diaoluo": 10,
"useNeed": [],
@ -3986,6 +3993,7 @@
"way": [],
"go": "",
"icon": "txk_022",
"sicon": "txk_022",
"describe": "intr_item_describe_50008",
"diaoluo": 11,
"useNeed": [],
@ -4004,6 +4012,7 @@
"way": [],
"go": "",
"icon": "txk_028",
"sicon": "txk_028",
"describe": "intr_item_describe_50009",
"diaoluo": 23,
"useNeed": [],
@ -4012,6 +4021,24 @@
"payId": "",
"advancedEffects": ""
},
"50010": {
"id": 50010,
"name": "playerheadFrame_name_24",
"type": 7,
"sort": 1,
"colour": 4,
"way": [],
"go": "",
"icon": "txk_025",
"sicon": "txk_025",
"describe": "intr_item_describe_50010",
"diaoluo": 24,
"useNeed": [],
"usePrize": [],
"selecPrize": [],
"payId": "",
"advancedEffects": ""
},
"50101": {
"id": 50101,
"name": "playerChatFrame_name_6",
@ -4022,6 +4049,7 @@
"way": [],
"go": "",
"icon": "lt_dhk11",
"sicon": "lt_dhk11",
"describe": "intr_item_describe_50101",
"diaoluo": 6,
"useNeed": [],
@ -4040,6 +4068,7 @@
"way": [],
"go": "",
"icon": "lt_dhk10",
"sicon": "lt_dhk10",
"describe": "intr_item_describe_50102",
"diaoluo": 7,
"useNeed": [],
@ -4058,6 +4087,7 @@
"way": [],
"go": "",
"icon": "txk_020",
"sicon": "txk_020",
"describe": "intr_item_describe_50103",
"diaoluo": 15,
"useNeed": [],
@ -4076,6 +4106,7 @@
"way": [],
"go": "",
"icon": "lt_dhk14",
"sicon": "lt_dhk14",
"describe": "intr_item_describe_50104",
"diaoluo": 8,
"useNeed": [],
@ -4094,6 +4125,7 @@
"way": [],
"go": "",
"icon": "txk_017",
"sicon": "txk_017",
"describe": "intr_item_describe_50201",
"diaoluo": 16,
"useNeed": [],
@ -4112,6 +4144,7 @@
"way": [],
"go": "",
"icon": "txk_011",
"sicon": "txk_011",
"describe": "intr_item_describe_50202",
"diaoluo": 17,
"useNeed": [],
@ -4130,6 +4163,7 @@
"way": [],
"go": "",
"icon": "txk_005",
"sicon": "txk_005",
"describe": "intr_item_describe_50203",
"diaoluo": 18,
"useNeed": [],
@ -4148,6 +4182,7 @@
"way": [],
"go": "",
"icon": "txk_004",
"sicon": "txk_004",
"describe": "intr_item_describe_50204",
"diaoluo": 19,
"useNeed": [],
@ -4166,6 +4201,7 @@
"way": [],
"go": "",
"icon": "txk_024",
"sicon": "txk_024",
"describe": "intr_item_describe_50205",
"diaoluo": 20,
"useNeed": [],
@ -4184,6 +4220,7 @@
"way": [],
"go": "",
"icon": "txk_013",
"sicon": "txk_013",
"describe": "intr_item_describe_50206",
"diaoluo": 21,
"useNeed": [],
@ -4202,6 +4239,7 @@
"way": [],
"go": "",
"icon": "txk_021",
"sicon": "txk_021",
"describe": "intr_item_describe_50207",
"diaoluo": 22,
"useNeed": [],
@ -4220,7 +4258,8 @@
"way": [],
"go": "",
"icon": 100011,
"describe": "intr_item_describe_50208",
"sicon": 100011,
"describe": "intr_item_describe_50301",
"diaoluo": 3,
"useNeed": [],
"usePrize": [],
@ -4238,7 +4277,8 @@
"way": [],
"go": "",
"icon": 100021,
"describe": "intr_item_describe_50209",
"sicon": 100021,
"describe": "intr_item_describe_50302",
"diaoluo": 4,
"useNeed": [],
"usePrize": [],

94
src/json/playerHead.json
View File

@ -33,13 +33,13 @@
"id": 3,
"name": "intr_playerinfo_name_3",
"undefined": "获得圣诞活动皮肤【圣诞庆典：男】后解锁",
"img": 10001,
"img": 100011,
"cond": [
"time",
-1
"model",
3
],
"intr": "intr_playerinfo_intr_3",
"sort": 42,
"sort": 3,
"buff": {},
"colour": 1,
"ani": ""
@ -48,13 +48,13 @@
"id": 4,
"name": "intr_playerinfo_name_4",
"undefined": "获得圣诞活动皮肤【圣诞庆典：女】后解锁",
"img": 10002,
"img": 100021,
"cond": [
"time",
-1
"model",
4
],
"intr": "intr_playerinfo_intr_4",
"sort": 43,
"sort": 4,
"buff": {},
"colour": 1,
"ani": ""
@ -69,7 +69,7 @@
1001
],
"intr": "intr_playerinfo_intr_1001",
"sort": 40,
"sort": 42,
"buff": {},
"colour": 1,
"ani": ""
@ -84,7 +84,7 @@
1002
],
"intr": "intr_playerinfo_intr_1002",
"sort": 41,
"sort": 43,
"buff": {},
"colour": 1,
"ani": ""
@ -99,7 +99,7 @@
2001
],
"intr": "intr_playerinfo_intr_2001",
"sort": 38,
"sort": 40,
"buff": {},
"colour": 1,
"ani": ""
@ -114,7 +114,7 @@
2002
],
"intr": "intr_playerinfo_intr_2002",
"sort": 39,
"sort": 41,
"buff": {},
"colour": 1,
"ani": ""
@ -129,7 +129,7 @@
3001
],
"intr": "intr_playerinfo_intr_3001",
"sort": 23,
"sort": 25,
"buff": {},
"colour": 1,
"ani": ""
@ -144,7 +144,7 @@
3002
],
"intr": "intr_playerinfo_intr_3002",
"sort": 24,
"sort": 26,
"buff": {},
"colour": 1,
"ani": ""
@ -159,7 +159,7 @@
3003
],
"intr": "intr_playerinfo_intr_3003",
"sort": 25,
"sort": 27,
"buff": {},
"colour": 1,
"ani": ""
@ -174,7 +174,7 @@
3004
],
"intr": "intr_playerinfo_intr_3004",
"sort": 26,
"sort": 28,
"buff": {},
"colour": 1,
"ani": ""
@ -189,7 +189,7 @@
3005
],
"intr": "intr_playerinfo_intr_3005",
"sort": 27,
"sort": 29,
"buff": {},
"colour": 1,
"ani": ""
@ -204,7 +204,7 @@
3006
],
"intr": "intr_playerinfo_intr_3006",
"sort": 28,
"sort": 30,
"buff": {},
"colour": 1,
"ani": ""
@ -219,7 +219,7 @@
3007
],
"intr": "intr_playerinfo_intr_3007",
"sort": 29,
"sort": 31,
"buff": {},
"colour": 1,
"ani": ""
@ -234,7 +234,7 @@
3008
],
"intr": "intr_playerinfo_intr_3008",
"sort": 30,
"sort": 32,
"buff": {},
"colour": 1,
"ani": ""
@ -249,7 +249,7 @@
3009
],
"intr": "intr_playerinfo_intr_3009",
"sort": 31,
"sort": 33,
"buff": {},
"colour": 1,
"ani": ""
@ -264,7 +264,7 @@
3010
],
"intr": "intr_playerinfo_intr_3010",
"sort": 32,
"sort": 34,
"buff": {},
"colour": 1,
"ani": ""
@ -279,7 +279,7 @@
3011
],
"intr": "intr_playerinfo_intr_3011",
"sort": 33,
"sort": 35,
"buff": {},
"colour": 1,
"ani": ""
@ -294,7 +294,7 @@
3012
],
"intr": "intr_playerinfo_intr_3012",
"sort": 34,
"sort": 36,
"buff": {},
"colour": 1,
"ani": ""
@ -309,7 +309,7 @@
3013
],
"intr": "intr_playerinfo_intr_3013",
"sort": 35,
"sort": 37,
"buff": {},
"colour": 1,
"ani": ""
@ -324,7 +324,7 @@
3014
],
"intr": "intr_playerinfo_intr_3014",
"sort": 36,
"sort": 38,
"buff": {},
"colour": 1,
"ani": ""
@ -339,7 +339,7 @@
3015
],
"intr": "intr_playerinfo_intr_3015",
"sort": 37,
"sort": 39,
"buff": {},
"colour": 1,
"ani": ""
@ -354,7 +354,7 @@
4001
],
"intr": "intr_playerinfo_intr_4001",
"sort": 8,
"sort": 10,
"buff": {},
"colour": 1,
"ani": ""
@ -369,7 +369,7 @@
4002
],
"intr": "intr_playerinfo_intr_4002",
"sort": 9,
"sort": 11,
"buff": {},
"colour": 1,
"ani": ""
@ -384,7 +384,7 @@
4003
],
"intr": "intr_playerinfo_intr_4003",
"sort": 10,
"sort": 12,
"buff": {},
"colour": 1,
"ani": ""
@ -399,7 +399,7 @@
4004
],
"intr": "intr_playerinfo_intr_4004",
"sort": 11,
"sort": 13,
"buff": {},
"colour": 1,
"ani": ""
@ -414,7 +414,7 @@
4005
],
"intr": "intr_playerinfo_intr_4005",
"sort": 12,
"sort": 14,
"buff": {},
"colour": 1,
"ani": ""
@ -429,7 +429,7 @@
4006
],
"intr": "intr_playerinfo_intr_4006",
"sort": 13,
"sort": 15,
"buff": {},
"colour": 1,
"ani": ""
@ -444,7 +444,7 @@
4007
],
"intr": "intr_playerinfo_intr_4007",
"sort": 14,
"sort": 16,
"buff": {},
"colour": 1,
"ani": ""
@ -459,7 +459,7 @@
4008
],
"intr": "intr_playerinfo_intr_4008",
"sort": 15,
"sort": 17,
"buff": {},
"colour": 1,
"ani": ""
@ -474,7 +474,7 @@
4009
],
"intr": "intr_playerinfo_intr_4009",
"sort": 16,
"sort": 18,
"buff": {},
"colour": 1,
"ani": ""
@ -489,7 +489,7 @@
4010
],
"intr": "intr_playerinfo_intr_4010",
"sort": 17,
"sort": 19,
"buff": {},
"colour": 1,
"ani": ""
@ -504,7 +504,7 @@
4011
],
"intr": "intr_playerinfo_intr_4011",
"sort": 18,
"sort": 20,
"buff": {},
"colour": 1,
"ani": ""
@ -519,7 +519,7 @@
4012
],
"intr": "intr_playerinfo_intr_4012",
"sort": 19,
"sort": 21,
"buff": {},
"colour": 1,
"ani": ""
@ -534,7 +534,7 @@
4013
],
"intr": "intr_playerinfo_intr_4013",
"sort": 20,
"sort": 22,
"buff": {},
"colour": 1,
"ani": ""
@ -549,7 +549,7 @@
4014
],
"intr": "intr_playerinfo_intr_4014",
"sort": 21,
"sort": 23,
"buff": {},
"colour": 1,
"ani": ""
@ -564,7 +564,7 @@
4015
],
"intr": "intr_playerinfo_intr_4015",
"sort": 22,
"sort": 24,
"buff": {},
"colour": 1,
"ani": ""
@ -579,7 +579,7 @@
5001
],
"intr": "intr_playerinfo_intr_5001",
"sort": 3,
"sort": 5,
"buff": {},
"colour": 1,
"ani": ""
@ -594,7 +594,7 @@
5002
],
"intr": "intr_playerinfo_intr_5002",
"sort": 4,
"sort": 6,
"buff": {},
"colour": 1,
"ani": ""
@ -609,7 +609,7 @@
5003
],
"intr": "intr_playerinfo_intr_5003",
"sort": 5,
"sort": 7,
"buff": {},
"colour": 1,
"ani": ""
@ -624,7 +624,7 @@
5004
],
"intr": "intr_playerinfo_intr_5004",
"sort": 6,
"sort": 8,
"buff": {},
"colour": 1,
"ani": ""
@ -639,7 +639,7 @@
5005
],
"intr": "intr_playerinfo_intr_5005",
"sort": 7,
"sort": 9,
"buff": {},
"colour": 1,
"ani": ""

17
src/json/playerHeadFrame.json
View File

@ -391,5 +391,22 @@
},
"colour": 4,
"ani": ""
},
"24": {
"id": 24,
"name": "playerheadFrame_name_24",
"undefined": "消费竞赛活动前三名获得，解锁后伤害加成+1%（限时7天）",
"img": "txk_025",
"cond": [
"time",
604800
],
"intr": "playerheadFrame_des_24",
"sort": 24,
"buff": {
"dpspro": 0.01
},
"colour": 5,
"ani": ""
}
}

138
src/json/playerModel.json
View File

@ -1,76 +1,74 @@
{
"1": {
"1": {
"type": 1,
"id": 1,
"name": "playerModel_name_1",
"head": 10001,
"img": "zhu_10001",
"cond": [
"lv",
1
],
"intr": "playerModel_des_1",
"sort": 1,
"buff": {},
"colour": 1,
"mwSpine": "ani_mingwangnan",
"fireHead": "img_lih2"
"id": 1,
"type": 1,
"name": "playerModel_name_1",
"head": 10001,
"img": "zhu_10001",
"cond": [
"lv",
1
],
"intr": "playerModel_des_1",
"sort": 1,
"buff": {},
"colour": 1,
"mwSpine": "ani_mingwangnan",
"fireHead": "img_lih2"
},
"2": {
"id": 2,
"type": 1,
"name": "playerModel_name_2",
"head": 10002,
"img": "zhu_10002",
"cond": [
"lv",
1
],
"intr": "playerModel_des_2",
"sort": 2,
"buff": {},
"colour": 1,
"mwSpine": "ani_mingwangnv",
"fireHead": "img_lih1"
},
"3": {
"id": 3,
"type": 1,
"name": "playerModel_name_3",
"head": 100011,
"img": 100011,
"cond": [
"time",
-1
],
"intr": "playerModel_des_3",
"sort": 3,
"buff": {
"defpro": 0.02
},
"2": {
"type": 1,
"id": 2,
"name": "playerModel_name_2",
"head": 10002,
"img": "zhu_10002",
"cond": [
"lv",
1
],
"intr": "playerModel_des_2",
"sort": 2,
"buff": {},
"colour": 1,
"mwSpine": "ani_mingwangnv",
"fireHead": "img_lih1"
"colour": 5,
"mwSpine": "ani_mingwangnan",
"fireHead": "img_lih21"
},
"4": {
"id": 4,
"type": 1,
"name": "playerModel_name_4",
"head": 100021,
"img": 100021,
"cond": [
"time",
-1
],
"intr": "playerModel_des_4",
"sort": 4,
"buff": {
"atkpro": 0.02
},
"3": {
"type": 1,
"id": 3,
"name": "playerModel_name_3",
"head": 100011,
"img": 100011,
"cond": [
"time",
-1
],
"intr": "playerModel_des_3",
"sort": 3,
"buff": {
"defpro": 0.02
},
"colour": 5,
"mwSpine": "ani_mingwangnan",
"fireHead": "img_lih21"
},
"4": {
"type": 1,
"id": 4,
"name": "playerModel_name_4",
"head": 100021,
"img": 100021,
"cond": [
"time",
-1
],
"intr": "playerModel_des_4",
"sort": 4,
"buff": {
"atkpro": 0.02
},
"colour": 5,
"mwSpine": "ani_mingwangnv",
"fireHead": "img_lih11"
}
"colour": 5,
"mwSpine": "ani_mingwangnv",
"fireHead": "img_lih11"
}
}

199
src/json/tuisonglibao.json
View File

@ -2,259 +2,266 @@
"1": {
"id": 1,
"type": 1,
"typeName": "tuisonglibao_name_2",
"num": [
100
5
],
"payId": [
"guanqialibao_1",
"guanqialibao_2",
"guanqialibao_3"
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"displayCD": 7200,
"scale": 500
},
"2": {
"id": 2,
"type": 1,
"typeName": "tuisonglibao_name_2",
"num": [
140
10
],
"payId": [
"guanqialibao_1",
"guanqialibao_3"
"guanqialibao_2"
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"displayCD": 7200,
"scale": 501
},
"3": {
"id": 3,
"type": 1,
"typeName": "tuisonglibao_name_2",
"num": [
180
20
],
"payId": [
"guanqialibao_1",
"guanqialibao_2",
"guanqialibao_3"
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"displayCD": 7200,
"scale": 502
},
"4": {
"id": 4,
"type": 1,
"typeName": "tuisonglibao_name_2",
"num": [
240
{
"a": "item",
"t": "1"
}
],
"payId": [
"guanqialibao_1",
"guanqialibao_2",
"guanqialibao_3"
"daojulibao_1",
"daojulibao_2"
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"displayCD": 7200,
"scale": 503
},
"5": {
"id": 5,
"type": 1,
"typeName": "tuisonglibao_name_2",
"num": [
300
{
"a": "item",
"t": "2"
}
],
"payId": [
"guanqialibao_1",
"guanqialibao_2",
"guanqialibao_3"
"daojulibao_1",
"daojulibao_3"
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"displayCD": 7200,
"scale": 504
},
"6": {
"id": 6,
"type": 1,
"typeName": "tuisonglibao_name_2",
"num": [
360
{
"a": "attr",
"t": "jinbi"
}
],
"payId": [
"guanqialibao_1",
"guanqialibao_2",
"guanqialibao_3"
"daojulibao_1",
"daojulibao_2",
"daojulibao_3"
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"displayCD": 7200,
"scale": 505
},
"7": {
"id": 7,
"type": 1,
"typeName": "tuisonglibao_name_2",
"num": [
400
1
],
"payId": [
"guanqialibao_1",
"guanqialibao_2",
"guanqialibao_3"
"zhanbailibao_1",
"zhanbailibao_2",
"zhanbailibao_3"
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"displayCD": 7200,
"scale": 506
},
"8": {
"id": 8,
"type": 1,
"typeName": "tuisonglibao_name_2",
"num": [
460
3
],
"payId": [
"guanqialibao_1",
"guanqialibao_2",
"guanqialibao_3"
"choukalibao_1",
"choukalibao_2",
"choukalibao_3"
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"displayCD": 7200,
"scale": 507
},
"9": {
"id": 9,
"type": 1,
"typeName": "tuisonglibao_name_2",
"num": [
490
31
],
"payId": [
"guanqialibao_1",
"guanqialibao_2",
"guanqialibao_3"
"lv30"
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 3300
},
"10": {
"id": 10,
"type": 1,
"typeName": "tuisonglibao_name_2",
"num": [
520
45
],
"payId": [
"guanqialibao_1",
"guanqialibao_2",
"guanqialibao_3"
"lv40"
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 3300
},
"11": {
"id": 11,
"type": 1,
"typeName": "tuisonglibao_name_2",
"num": [
550
50
],
"payId": [
"guanqialibao_1",
"guanqialibao_2",
"guanqialibao_3"
"lv55"
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 2000
},
"12": {
"id": 12,
"type": 1,
"typeName": "tuisonglibao_name_2",
"num": [
580
53
],
"payId": [
"guanqialibao_1",
"guanqialibao_2",
"guanqialibao_4"
"lv58"
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 2000
},
"13": {
"id": 13,
"type": 1,
"typeName": "tuisonglibao_name_2",
"num": [
610
56
],
"payId": [
"guanqialibao_1",
"guanqialibao_2",
"guanqialibao_4"
"lv60"
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 2000
},
"14": {
"id": 14,
"type": 1,
"typeName": "tuisonglibao_name_2",
"num": [
640
60
],
"payId": [
"guanqialibao_1",
"guanqialibao_2",
"guanqialibao_4"
"lv63"
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 2000
},
"15": {
"id": 15,
"type": 1,
"typeName": "tuisonglibao_name_2",
"num": [
670
63
],
"payId": [
"guanqialibao_1",
"guanqialibao_2",
"guanqialibao_4"
"lv66"
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 2000
},
"16": {
"id": 16,
"type": 1,
"typeName": "tuisonglibao_name_2",
"num": [
700
66
],
"payId": [
"guanqialibao_1",
"guanqialibao_2",
"guanqialibao_4"
"lv69"
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 1800
},
"17": {
"id": 17,
"type": 1,
"typeName": "tuisonglibao_name_2",
"num": [
730
68
],
"payId": [
"guanqialibao_1",
"guanqialibao_2",
"guanqialibao_4"
"lv72"
],
"time": 3600,
"displayCD": 3600,
"scale": 3000
"scale": 1800
},
"18": {
"id": 18,
"type": 1,
"typeName": "tuisonglibao_name_2",
"num": [
760
],
@ -270,6 +277,7 @@
"101": {
"id": 101,
"type": 2,
"typeName": "tuisonglibao_name_3",
"num": [
{
"a": "item",
@ -288,6 +296,7 @@
"102": {
"id": 102,
"type": 2,
"typeName": "tuisonglibao_name_3",
"num": [
{
"a": "item",
@ -306,6 +315,7 @@
"103": {
"id": 103,
"type": 2,
"typeName": "tuisonglibao_name_3",
"num": [
{
"a": "item",
@ -324,6 +334,7 @@
"104": {
"id": 104,
"type": 2,
"typeName": "tuisonglibao_name_3",
"num": [
{
"a": "item",
@ -342,6 +353,7 @@
"401": {
"id": 401,
"type": 5,
"typeName": "tuisonglibao_name_1",
"num": [
15
],
@ -355,6 +367,7 @@
"402": {
"id": 402,
"type": 5,
"typeName": "tuisonglibao_name_1",
"num": [
25
],
@ -368,6 +381,7 @@
"403": {
"id": 403,
"type": 5,
"typeName": "tuisonglibao_name_1",
"num": [
40
],
@ -382,6 +396,7 @@
"404": {
"id": 404,
"type": 5,
"typeName": "tuisonglibao_name_1",
"num": [
50
],
@ -396,6 +411,7 @@
"405": {
"id": 405,
"type": 5,
"typeName": "tuisonglibao_name_1",
"num": [
55
],
@ -410,6 +426,7 @@
"406": {
"id": 406,
"type": 5,
"typeName": "tuisonglibao_name_1",
"num": [
60
],
@ -424,6 +441,7 @@
"407": {
"id": 407,
"type": 5,
"typeName": "tuisonglibao_name_1",
"num": [
63
],
@ -438,6 +456,7 @@
"408": {
"id": 408,
"type": 5,
"typeName": "tuisonglibao_name_1",
"num": [
66
],
@ -452,6 +471,7 @@
"409": {
"id": 409,
"type": 5,
"typeName": "tuisonglibao_name_1",
"num": [
69
],
@ -466,12 +486,12 @@
"410": {
"id": 410,
"type": 5,
"typeName": "tuisonglibao_name_1",
"num": [
73
70
],
"payId": [
"lv73_1",
"lv73_2"
"lv75"
],
"time": 3600,
"displayCD": 3600,
@ -480,6 +500,7 @@
"411": {
"id": 411,
"type": 5,
"typeName": "tuisonglibao_name_1",
"num": [
82
],

4
src/jsonType.ts
View File

@ -1032,7 +1032,7 @@ type gc_playerLv = k_v<{
'tujianlv': number
}>;
type gc_playerModel = k_v<k_v<{
type gc_playerModel = k_v<{
/** 类型 */
'type': number
/** id */
@ -1057,7 +1057,7 @@ type gc_playerModel = k_v<k_v<{
'mwSpine': string
/** 战斗半身像 */
'fireHead': string
}>>;
}>;
type gc_pmd = { "get_hero_star5_pmd": string, "glkb_pmd": string, "jinjie_peijian": string, "guild_pmd": string, "tlsd_pmd": string, "hbzb_pmd1": string, "hbzb_pmd2": string, "hbzb_pmd3": string, [x: string]: any }

85
src/monopoly/protocols/serviceProto.ts
View File

@ -2193,6 +2193,29 @@ export const serviceProto: ServiceProto<ServiceType> = {
},
{
"id": 5,
"name": "upModel",
"type": {
"type": "Interface",
"properties": [
{
"id": 0,
"name": "id",
"type": {
"type": "String"
}
},
{
"id": 1,
"name": "time",
"type": {
"type": "Number"
}
}
]
}
},
{
"id": 6,
"name": "model",
"type": {
"type": "Interface",
@ -2221,14 +2244,14 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 6,
"id": 7,
"name": "renown",
"type": {
"type": "Number"
}
},
{
"id": 7,
"id": 8,
"name": "wxcLv",
"type": {
"type": "Interface",
@ -2254,14 +2277,14 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 8,
"id": 9,
"name": "mapId",
"type": {
"type": "Number"
}
},
{
"id": 9,
"id": 10,
"name": "shoucangping",
"type": {
"type": "Interface",
@ -2274,14 +2297,14 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 10,
"id": 11,
"name": "useTujianLvPoint",
"type": {
"type": "Number"
}
},
{
"id": 11,
"id": 12,
"name": "skills",
"type": {
"type": "Interface",
@ -2294,7 +2317,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 12,
"id": 13,
"name": "fightSkills",
"type": {
"type": "Interface",
@ -2307,7 +2330,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 13,
"id": 14,
"name": "heroPos",
"type": {
"type": "Interface",
@ -2320,21 +2343,21 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 14,
"id": 15,
"name": "ghId",
"type": {
"type": "String"
}
},
{
"id": 15,
"id": 16,
"name": "ghName",
"type": {
"type": "String"
}
},
{
"id": 16,
"id": 17,
"name": "ghLevel",
"type": {
"type": "Reference",
@ -2342,7 +2365,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 17,
"id": 18,
"name": "ghwz",
"type": {
"type": "Interface",
@ -2356,7 +2379,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 18,
"id": 19,
"name": "ghExitTime",
"type": {
"type": "Number"
@ -2364,7 +2387,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 19,
"id": 20,
"name": "loginTime",
"type": {
"type": "Number"
@ -2372,7 +2395,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 20,
"id": 21,
"name": "logoutTime",
"type": {
"type": "Number"
@ -2380,7 +2403,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 21,
"id": 22,
"name": "cTime",
"type": {
"type": "Number"
@ -2388,7 +2411,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 22,
"id": 23,
"name": "loginDays",
"type": {
"type": "Number"
@ -2396,7 +2419,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 23,
"id": 24,
"name": "serverName",
"type": {
"type": "String"
@ -2404,7 +2427,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 24,
"id": 25,
"name": "sid",
"type": {
"type": "Number"
@ -2412,7 +2435,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 25,
"id": 26,
"name": "onlineTime",
"type": {
"type": "Number"
@ -2420,7 +2443,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 26,
"id": 27,
"name": "newonlinetime",
"type": {
"type": "Number"
@ -2428,7 +2451,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 27,
"id": 28,
"name": "isNpc",
"type": {
"type": "Boolean"
@ -2436,7 +2459,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 28,
"id": 29,
"name": "matrix",
"type": {
"type": "Interface",
@ -2450,7 +2473,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 29,
"id": 30,
"name": "matrixPos",
"type": {
"type": "Interface",
@ -2470,7 +2493,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 30,
"id": 31,
"name": "selectMatrix",
"type": {
"type": "String"
@ -2478,7 +2501,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 31,
"id": 32,
"name": "fightHeros",
"type": {
"type": "Array",
@ -2489,7 +2512,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 32,
"id": 33,
"name": "helpHeros",
"type": {
"type": "Array",
@ -2566,7 +2589,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 33,
"id": 34,
"name": "changeNameNum",
"type": {
"type": "Number"
@ -2574,7 +2597,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 34,
"id": 35,
"name": "peijianUnlock",
"type": {
"type": "Interface",
@ -2588,7 +2611,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 35,
"id": 36,
"name": "headFrames",
"type": {
"type": "Interface",
@ -2602,7 +2625,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 36,
"id": 37,
"name": "chatFrames",
"type": {
"type": "Interface",

119
src/public/user.ts
View File

@ -1,14 +1,14 @@
import CryptoJS from 'crypto-js';
import { ObjectId, OptionalId, WithId } from 'mongodb';
import { BaseConnection } from 'tsrpc';
import { Wjjl } from '../module/collection_wjjl';
import { ServiceType } from '../shared/protocols/serviceProto';
import { ReqLogin, ResLogin, playerAppend, playerAttr, playerInfo } from '../shared/protocols/user/PtlLogin';
import { player } from '../shared/protocols/user/type';
import { PublicShared } from '../shared/public/public';
import { PlayerFun } from './player';
import { ZhanLingTasks } from './zhanling';
import { getGud, setGud } from './gud';
import {ObjectId, OptionalId, WithId} from 'mongodb';
import {BaseConnection} from 'tsrpc';
import {Wjjl} from '../module/collection_wjjl';
import {ServiceType} from '../shared/protocols/serviceProto';
import {ReqLogin, ResLogin, playerAppend, playerAttr, playerInfo} from '../shared/protocols/user/PtlLogin';
import {player} from '../shared/protocols/user/type';
import {PublicShared} from '../shared/public/public';
import {PlayerFun} from './player';
import {ZhanLingTasks} from './zhanling';
import {getGud, setGud} from './gud';
export const defaultUserInfo: playerInfo = {
lv: 1,
@ -30,14 +30,13 @@ export const defaultUserAttr: playerAttr = {
export const defaultUserAppend: playerAppend = {
name: '',
tujianLv: 0,
head: { id: "1", time: -1 },
headFrame: { id: "1", time: -1 },
chatFrame: { id: "1", time: -1 },
head: {id: "1", time: -1},
headFrame: {id: "1", time: -1},
chatFrame: {id: "1", time: -1},
upModel: {id: "1", time: -1},
model: {
1: { id: "1", time: -1 },
2: { id: "1", time: -1 },
3: { id: "1", time: -1 },
4: { id: "1", time: -1 },
1: {id: "1", time: -1},
2: {id: "2", time: -1}
},
renown: 0,
wxcLv: {
@ -60,12 +59,12 @@ export const defaultUserAppend: playerAppend = {
ghId: '',
ghName: '',
ghLevel: 0,
ghwz: { 1: 0, 2: 0, 3: 0, 4: 0 }
ghwz: {1: 0, 2: 0, 3: 0, 4: 0}
};
export class UserFun {
static create(bUid: string) {
let { bindUid, ...userInfo } = defaultUserInfo;
let {bindUid, ...userInfo} = defaultUserInfo;
return {
bindUid: bUid,
@ -73,6 +72,7 @@ export class UserFun {
...defaultUserAttr
};
}
static async check(gud: ResLogin['gud'], req: ReqLogin) {
let obj: k_v<any> = {};
let add: k_v<any> = {};
@ -126,14 +126,14 @@ export class UserFun {
if (h_ids.length < 1) {
gud.fightHeros = [];
} else {
let dHeros = await G.mongodb.collection('hero').find({ _id: { $in: h_ids.map(id => G.mongodb.conversionId(id)) } }).toArray();
let dHeros = await G.mongodb.collection('hero').find({_id: {$in: h_ids.map(id => G.mongodb.conversionId(id))}}).toArray();
gud.fightHeros = dHeros.map(h => h.heroId.toString());
}
add.fightHeros = gud.fightHeros;
}
if (!gud.matrixPos) {
gud.matrixPos = Object.fromEntries(Object.keys(G.gc.fightPlan).map(pos => [pos, { ...gud.heroPos }]));
gud.matrixPos = Object.fromEntries(Object.keys(G.gc.fightPlan).map(pos => [pos, {...gud.heroPos}]));
add.matrixPos = gud.matrixPos;
}
@ -197,7 +197,7 @@ export class UserFun {
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
}
@ -211,24 +211,25 @@ export class UserFun {
return obj;
}
// 检查空数据并修复
static async checkUidOrName() {
let users = await G.mongodb.collection('user').findOne({$or: [{uid: {$in:['', null]}},{name: {$in: ['', null]}}]})
if(users) {
let users = await G.mongodb.collection('user').findOne({$or: [{uid: {$in: ['', null]}}, {name: {$in: ['', null]}}]})
if (users) {
let {bindUid, sid, _id} = users
let uid = users.uid || (sid + '_' + _id)
// 随机创建name
let b64 = CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(bindUid + sid));
let name = users.name || `temp_${b64}`.toLocaleLowerCase();
await G.mongodb.collection('user').updateOne({ bindUid, sid }, {
await G.mongodb.collection('user').updateOne({bindUid, sid}, {
$set: {
uid, name
}
});
}
return
return
}
/**创建账号数据 */
static async createUser(client: BaseConnection<ServiceType>, bindUid: string, sid: number): Promise<WithId<OptionalId<ResLogin['gud']>>> {
// 开启事务
@ -258,14 +259,17 @@ export class UserFun {
// session.endSession() // 结束事务
return gud as WithId<OptionalId<ResLogin['gud']>>;
}
/**获取玩家附带的buff加成 */
static getOtherBuff(gud: ResLogin['gud']) {
return gud;
}
static async getGud(uid: string) {
//return await G.redis.get('user', uid);
return await getGud(uid);
}
/**激活头像框 */
static async activeHeadFrame(uid: string, k: string, v: number) {
let gud: player;
@ -312,11 +316,12 @@ export class UserFun {
}
if (change) {
PlayerFun.changeAttr(uid, { headFrames: gud.headFrames });
G.server.sendMsgByUid(uid, 'msg_s2c/PlayerChange', { headFrames: gud.headFrames });
PlayerFun.changeAttr(uid, {headFrames: gud.headFrames});
G.server.sendMsgByUid(uid, 'msg_s2c/PlayerChange', {headFrames: gud.headFrames});
G.server.uid_connections[uid]?.refreshPower();
}
}
/**激活聊天框 */
static async activeChatFrame(uid: string, k: string, v: number) {
let gud: player;
@ -363,8 +368,60 @@ export class UserFun {
}
if (change) {
PlayerFun.changeAttr(uid, { chatFrames: gud.chatFrames });
G.server.sendMsgByUid(uid, 'msg_s2c/PlayerChange', { chatFrames: gud.chatFrames });
PlayerFun.changeAttr(uid, {chatFrames: gud.chatFrames});
G.server.sendMsgByUid(uid, 'msg_s2c/PlayerChange', {chatFrames: gud.chatFrames});
G.server.uid_connections[uid]?.refreshPower();
}
}
/**激活造型 */
static async activeModel(uid: string, k: string, v: number) {
let gud: player;
// if (G.server.uid_connections[uid]) {
// gud = G.server.uid_connections[uid].gud;
// } else {
// gud = await G.redis.get('user', uid);
// }
gud = await getGud(uid);
let change = false;
let model = G.gc.playerModel;
let checks = Object.values(model).filter(v => v.cond[0] == k);
if (checks.length > 0) {
checks.forEach(conf => {
let val = v;
if (k == 'wxcLv') val = gud.wxcLv.lv;
else if (gud[k] != undefined) val = gud[k];
if (k == 'jjc_rank' && !gud.model[conf.id] && val <= conf.cond[1]) {
gud.model[conf.id] = {id: conf.id + '', time: -1};
change = true;
} else if (!gud.model[conf.id] && val >= conf.cond[1]) {
gud.model[conf.id] = {id: conf.id + '', time: -1};
change = true;
}
});
} else {
let conf = model[k];
if (conf?.cond?.[0] == 'time') {
let val = conf.cond[1];
if (val == -1 && gud.model[conf.id]) {
change = true;
gud.model[conf.id] = {id: conf.id + '', time: -1};
} else if (!gud.model[conf.id] || gud.model[conf.id].time < G.time) {
change = true;
gud.model[conf.id] = {id: conf.id + '', time: G.time + val * v};
} else {
change = true;
gud.model[conf.id] = {id: conf.id + '', time: gud.model[conf.id].time += val * v}
}
}
}
if (change) {
PlayerFun.changeAttr(uid, {model: gud.model});
G.server.sendMsgByUid(uid, 'msg_s2c/PlayerChange', {model: gud.model});
G.server.uid_connections[uid]?.refreshPower();
}
}

255
src/shared/protocols/serviceProto.ts
View File

@ -4001,6 +4001,29 @@ export const serviceProto: ServiceProto<ServiceType> = {
},
{
"id": 5,
"name": "upModel",
"type": {
"type": "Interface",
"properties": [
{
"id": 0,
"name": "id",
"type": {
"type": "String"
}
},
{
"id": 1,
"name": "time",
"type": {
"type": "Number"
}
}
]
}
},
{
"id": 6,
"name": "model",
"type": {
"type": "Interface",
@ -4029,14 +4052,14 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 6,
"id": 7,
"name": "renown",
"type": {
"type": "Number"
}
},
{
"id": 7,
"id": 8,
"name": "wxcLv",
"type": {
"type": "Interface",
@ -4062,14 +4085,14 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 8,
"id": 9,
"name": "mapId",
"type": {
"type": "Number"
}
},
{
"id": 9,
"id": 10,
"name": "shoucangping",
"type": {
"type": "Interface",
@ -4082,14 +4105,14 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 10,
"id": 11,
"name": "useTujianLvPoint",
"type": {
"type": "Number"
}
},
{
"id": 11,
"id": 12,
"name": "skills",
"type": {
"type": "Interface",
@ -4102,7 +4125,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 12,
"id": 13,
"name": "fightSkills",
"type": {
"type": "Interface",
@ -4115,7 +4138,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 13,
"id": 14,
"name": "heroPos",
"type": {
"type": "Interface",
@ -4128,21 +4151,21 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 14,
"id": 15,
"name": "ghId",
"type": {
"type": "String"
}
},
{
"id": 15,
"id": 16,
"name": "ghName",
"type": {
"type": "String"
}
},
{
"id": 16,
"id": 17,
"name": "ghLevel",
"type": {
"type": "Reference",
@ -4150,7 +4173,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 17,
"id": 18,
"name": "ghwz",
"type": {
"type": "Interface",
@ -4164,7 +4187,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 18,
"id": 19,
"name": "ghExitTime",
"type": {
"type": "Number"
@ -4172,7 +4195,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 19,
"id": 20,
"name": "loginTime",
"type": {
"type": "Number"
@ -4180,7 +4203,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 20,
"id": 21,
"name": "logoutTime",
"type": {
"type": "Number"
@ -4188,7 +4211,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 21,
"id": 22,
"name": "cTime",
"type": {
"type": "Number"
@ -4196,7 +4219,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 22,
"id": 23,
"name": "loginDays",
"type": {
"type": "Number"
@ -4204,7 +4227,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 23,
"id": 24,
"name": "serverName",
"type": {
"type": "String"
@ -4212,7 +4235,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 24,
"id": 25,
"name": "sid",
"type": {
"type": "Number"
@ -4220,7 +4243,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 25,
"id": 26,
"name": "onlineTime",
"type": {
"type": "Number"
@ -4228,7 +4251,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 26,
"id": 27,
"name": "newonlinetime",
"type": {
"type": "Number"
@ -4236,7 +4259,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 27,
"id": 28,
"name": "isNpc",
"type": {
"type": "Boolean"
@ -4244,7 +4267,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 28,
"id": 29,
"name": "matrix",
"type": {
"type": "Interface",
@ -4258,7 +4281,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 29,
"id": 30,
"name": "matrixPos",
"type": {
"type": "Interface",
@ -4278,7 +4301,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 30,
"id": 31,
"name": "selectMatrix",
"type": {
"type": "String"
@ -4286,7 +4309,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 31,
"id": 32,
"name": "fightHeros",
"type": {
"type": "Array",
@ -4297,7 +4320,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 32,
"id": 33,
"name": "helpHeros",
"type": {
"type": "Array",
@ -4374,7 +4397,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 33,
"id": 34,
"name": "changeNameNum",
"type": {
"type": "Number"
@ -4382,7 +4405,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 34,
"id": 35,
"name": "peijianUnlock",
"type": {
"type": "Interface",
@ -4396,7 +4419,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 35,
"id": 36,
"name": "headFrames",
"type": {
"type": "Interface",
@ -4410,7 +4433,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 36,
"id": 37,
"name": "chatFrames",
"type": {
"type": "Interface",
@ -5222,6 +5245,29 @@ export const serviceProto: ServiceProto<ServiceType> = {
},
{
"id": 5,
"name": "upModel",
"type": {
"type": "Interface",
"properties": [
{
"id": 0,
"name": "id",
"type": {
"type": "String"
}
},
{
"id": 1,
"name": "time",
"type": {
"type": "Number"
}
}
]
}
},
{
"id": 6,
"name": "model",
"type": {
"type": "Interface",
@ -5250,14 +5296,14 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 6,
"id": 7,
"name": "renown",
"type": {
"type": "Number"
}
},
{
"id": 7,
"id": 8,
"name": "wxcLv",
"type": {
"type": "Interface",
@ -5283,14 +5329,14 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 8,
"id": 9,
"name": "mapId",
"type": {
"type": "Number"
}
},
{
"id": 9,
"id": 10,
"name": "shoucangping",
"type": {
"type": "Interface",
@ -5303,14 +5349,14 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 10,
"id": 11,
"name": "useTujianLvPoint",
"type": {
"type": "Number"
}
},
{
"id": 11,
"id": 12,
"name": "skills",
"type": {
"type": "Interface",
@ -5323,7 +5369,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 12,
"id": 13,
"name": "fightSkills",
"type": {
"type": "Interface",
@ -5336,7 +5382,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 13,
"id": 14,
"name": "heroPos",
"type": {
"type": "Interface",
@ -5349,21 +5395,21 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 14,
"id": 15,
"name": "ghId",
"type": {
"type": "String"
}
},
{
"id": 15,
"id": 16,
"name": "ghName",
"type": {
"type": "String"
}
},
{
"id": 16,
"id": 17,
"name": "ghLevel",
"type": {
"type": "Reference",
@ -5371,7 +5417,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 17,
"id": 18,
"name": "ghwz",
"type": {
"type": "Interface",
@ -5385,7 +5431,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 18,
"id": 19,
"name": "ghExitTime",
"type": {
"type": "Number"
@ -5393,7 +5439,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 19,
"id": 20,
"name": "loginTime",
"type": {
"type": "Number"
@ -5401,7 +5447,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 20,
"id": 21,
"name": "logoutTime",
"type": {
"type": "Number"
@ -5409,7 +5455,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 21,
"id": 22,
"name": "cTime",
"type": {
"type": "Number"
@ -5417,7 +5463,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 22,
"id": 23,
"name": "loginDays",
"type": {
"type": "Number"
@ -5425,7 +5471,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 23,
"id": 24,
"name": "serverName",
"type": {
"type": "String"
@ -5433,7 +5479,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 24,
"id": 25,
"name": "sid",
"type": {
"type": "Number"
@ -5441,7 +5487,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 25,
"id": 26,
"name": "onlineTime",
"type": {
"type": "Number"
@ -5449,7 +5495,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 26,
"id": 27,
"name": "newonlinetime",
"type": {
"type": "Number"
@ -5457,7 +5503,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 27,
"id": 28,
"name": "isNpc",
"type": {
"type": "Boolean"
@ -5465,7 +5511,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 28,
"id": 29,
"name": "matrix",
"type": {
"type": "Interface",
@ -5479,7 +5525,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 29,
"id": 30,
"name": "matrixPos",
"type": {
"type": "Interface",
@ -5499,7 +5545,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 30,
"id": 31,
"name": "selectMatrix",
"type": {
"type": "String"
@ -5507,7 +5553,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 31,
"id": 32,
"name": "fightHeros",
"type": {
"type": "Array",
@ -5518,7 +5564,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 32,
"id": 33,
"name": "helpHeros",
"type": {
"type": "Array",
@ -5595,7 +5641,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 33,
"id": 34,
"name": "changeNameNum",
"type": {
"type": "Number"
@ -5603,7 +5649,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 34,
"id": 35,
"name": "peijianUnlock",
"type": {
"type": "Interface",
@ -5617,7 +5663,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 35,
"id": 36,
"name": "headFrames",
"type": {
"type": "Interface",
@ -5631,7 +5677,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 36,
"id": 37,
"name": "chatFrames",
"type": {
"type": "Interface",
@ -23131,6 +23177,29 @@ export const serviceProto: ServiceProto<ServiceType> = {
},
{
"id": 5,
"name": "upModel",
"type": {
"type": "Interface",
"properties": [
{
"id": 0,
"name": "id",
"type": {
"type": "String"
}
},
{
"id": 1,
"name": "time",
"type": {
"type": "Number"
}
}
]
}
},
{
"id": 6,
"name": "model",
"type": {
"type": "Interface",
@ -23159,14 +23228,14 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 6,
"id": 7,
"name": "renown",
"type": {
"type": "Number"
}
},
{
"id": 7,
"id": 8,
"name": "wxcLv",
"type": {
"type": "Interface",
@ -23192,14 +23261,14 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 8,
"id": 9,
"name": "mapId",
"type": {
"type": "Number"
}
},
{
"id": 9,
"id": 10,
"name": "shoucangping",
"type": {
"type": "Interface",
@ -23212,14 +23281,14 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 10,
"id": 11,
"name": "useTujianLvPoint",
"type": {
"type": "Number"
}
},
{
"id": 11,
"id": 12,
"name": "skills",
"type": {
"type": "Interface",
@ -23232,7 +23301,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 12,
"id": 13,
"name": "fightSkills",
"type": {
"type": "Interface",
@ -23245,7 +23314,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 13,
"id": 14,
"name": "heroPos",
"type": {
"type": "Interface",
@ -23258,21 +23327,21 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 14,
"id": 15,
"name": "ghId",
"type": {
"type": "String"
}
},
{
"id": 15,
"id": 16,
"name": "ghName",
"type": {
"type": "String"
}
},
{
"id": 16,
"id": 17,
"name": "ghLevel",
"type": {
"type": "Reference",
@ -23280,7 +23349,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
{
"id": 17,
"id": 18,
"name": "ghwz",
"type": {
"type": "Interface",
@ -23294,7 +23363,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 18,
"id": 19,
"name": "ghExitTime",
"type": {
"type": "Number"
@ -23302,7 +23371,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 19,
"id": 20,
"name": "loginTime",
"type": {
"type": "Number"
@ -23310,7 +23379,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 20,
"id": 21,
"name": "logoutTime",
"type": {
"type": "Number"
@ -23318,7 +23387,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 21,
"id": 22,
"name": "cTime",
"type": {
"type": "Number"
@ -23326,7 +23395,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 22,
"id": 23,
"name": "loginDays",
"type": {
"type": "Number"
@ -23334,7 +23403,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 23,
"id": 24,
"name": "serverName",
"type": {
"type": "String"
@ -23342,7 +23411,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 24,
"id": 25,
"name": "sid",
"type": {
"type": "Number"
@ -23350,7 +23419,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 25,
"id": 26,
"name": "onlineTime",
"type": {
"type": "Number"
@ -23358,7 +23427,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 26,
"id": 27,
"name": "newonlinetime",
"type": {
"type": "Number"
@ -23366,7 +23435,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 27,
"id": 28,
"name": "isNpc",
"type": {
"type": "Boolean"
@ -23374,7 +23443,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 28,
"id": 29,
"name": "matrix",
"type": {
"type": "Interface",
@ -23388,7 +23457,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 29,
"id": 30,
"name": "matrixPos",
"type": {
"type": "Interface",
@ -23408,7 +23477,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 30,
"id": 31,
"name": "selectMatrix",
"type": {
"type": "String"
@ -23416,7 +23485,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 31,
"id": 32,
"name": "fightHeros",
"type": {
"type": "Array",
@ -23427,7 +23496,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 32,
"id": 33,
"name": "helpHeros",
"type": {
"type": "Array",
@ -23504,7 +23573,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 33,
"id": 34,
"name": "changeNameNum",
"type": {
"type": "Number"
@ -23512,7 +23581,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 34,
"id": 35,
"name": "peijianUnlock",
"type": {
"type": "Interface",
@ -23526,7 +23595,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 35,
"id": 36,
"name": "headFrames",
"type": {
"type": "Interface",
@ -23540,7 +23609,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true
},
{
"id": 36,
"id": 37,
"name": "chatFrames",
"type": {
"type": "Interface",

9
src/shared/protocols/user/PtlLogin.ts
View File

@ -19,7 +19,7 @@ export type ResLogin = {
/**
* 开服天数
*/
openDay:number;
openDay: number;
/**当前时间 */
curTime: number;
/**是否第一次登录 */
@ -94,6 +94,13 @@ export type playerAppend = {
};
/**名字 */
name: string;
/**正在使用的造型 */
upModel: {
/**id */
id: string,
/**到期时间戳 -1：永久 */
time: number;
};
/**造型 */
model: {
[k: string]: {

25
src/shared/public/user.ts
View File

@ -4,22 +4,39 @@ export class UserShared {
return Array.from(arguments).filter(s => s != '').join('_');
}
// todo active始终为空，暂时获取对应的avtive，解决打包上线的圣诞版本，
// 后续要理清数据格式，填入playerinfo的active，包括user/infoOpen接口的返回
static getActive(fmtId, player, type, id?) {
switch (type) {
case 'head':
return {[fmtId]: player.head?.time}
case 'headFrame':
return {[fmtId]: player.headFrames[id]}
case 'chatFrame':
return {[fmtId]: player.chatFrames[id]}
case 'model':
return {[fmtId]: player.model?.[id]?.time}
}
return {}
}
/**
* 判断头像之类是否激活
* @param id 请使用 UserShared.getInfo 转化后的id
*/
static chechIsActive(fmtId: string, collection: Partial<{ lv: number, vip: number, lsyx: k_v<number>, model: k_v<any>, active: k_v<number>; }>) {
const [type, id, pos] = fmtId.split('_');
const [type, id] = fmtId.split('_');
const jsonName = 'player' + type.slice(0, 1).toLocaleUpperCase() + type.slice(1);
const json = G.gc[jsonName] as any;
const conf: _gcType['playerHead'][''] = pos ? json[pos][id] : json[id];
const conf: _gcType['playerHead'] = json[id];
if (conf.cond[0] == 'lv') return collection.lv >= conf.cond[1];
else if (conf.cond[0] == 'vip') return collection.vip >= conf.cond[1];
else if (conf.cond[0] == 'hero') return collection.lsyx[conf.cond[1]] > 0;
else if (conf.cond[0] == 'time') return collection.active[fmtId] == -1 || collection.active[fmtId] > G.time;
else if (conf.cond[0] == 'model') return Object.values(collection.model).find(i=>i.id==conf.cond[1]);
// else if (conf.cond[0] == 'time') return collection.active[fmtId] == -1 || collection.active[fmtId] > G.time;
else if (conf.cond[0] == 'time') return conf.cond[1] == -1 || collection.active?.[fmtId] > G.time;
else if (conf.cond[0] == 'model') return Object.values(collection.model).find(i => i.id == conf.cond[1]);
else return false;
}
}

1122
tsbufferIndex.js Normal file
View File

File diff suppressed because it is too large Load Diff