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 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} 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, "private": true,
"scripts": { "scripts": {
"dev": "tsrpc-cli dev", "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": "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 && 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 src/json/ -a dist ", "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_win": "npm run build_win && cd dist && npm i --omit=dev",
"build_docker_linux": "npm run build_linux && 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", "doc": "tsrpc-cli doc && node js_uploadDoc.js",

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

@ -105,8 +105,9 @@ export default async function (call: ApiCall<ReqUse, ResUse>) {
n: useNum 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 (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 == 7) UserFun.activeHeadFrame(call.uid, itemConf.diaoluo.toString(), useNum);
if (itemConf.type == 8) UserFun.activeChatFrame(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>) { 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, uid: call.uid,
type: 'playerInfo' type: 'playerInfo'
}))?.active || {}; }))?.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, { const isMeet = UserShared.chechIsActive(fmtId, {
lv: call.conn.gud.lv, lv: call.conn.gud.lv,
vip: call.conn.gud.vip, vip: call.conn.gud.vip,
@ -27,10 +29,12 @@ export default async function (call: ApiCall<ReqChangeInfo, ResChangeInfo>) {
if (call.req.type == 'model') { if (call.req.type == 'model') {
let d = JSON.parse(JSON.stringify(call.conn.gud.model)); let d = JSON.parse(JSON.stringify(call.conn.gud.model));
d[call.req.pos] = { let changeItem = {
id: call.req.id, id: call.req.id,
time: active[fmtId] || -1 time: active[fmtId] || -1
}; }
d[call.req.id] = changeItem
change.upModel = changeItem
change.model = d; change.model = d;
} else { } else {
change[call.req.type] = { change[call.req.type] = {

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

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

44
src/json/item.json
View File

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

94
src/json/playerHead.json
View File

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

17
src/json/playerHeadFrame.json
View File

@ -391,5 +391,22 @@
}, },
"colour": 4, "colour": 4,
"ani": "" "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": ""
} }
} }

10
src/json/playerModel.json
View File

@ -1,8 +1,7 @@
{ {
"1": { "1": {
"1": {
"type": 1,
"id": 1, "id": 1,
"type": 1,
"name": "playerModel_name_1", "name": "playerModel_name_1",
"head": 10001, "head": 10001,
"img": "zhu_10001", "img": "zhu_10001",
@ -18,8 +17,8 @@
"fireHead": "img_lih2" "fireHead": "img_lih2"
}, },
"2": { "2": {
"type": 1,
"id": 2, "id": 2,
"type": 1,
"name": "playerModel_name_2", "name": "playerModel_name_2",
"head": 10002, "head": 10002,
"img": "zhu_10002", "img": "zhu_10002",
@ -35,8 +34,8 @@
"fireHead": "img_lih1" "fireHead": "img_lih1"
}, },
"3": { "3": {
"type": 1,
"id": 3, "id": 3,
"type": 1,
"name": "playerModel_name_3", "name": "playerModel_name_3",
"head": 100011, "head": 100011,
"img": 100011, "img": 100011,
@ -54,8 +53,8 @@
"fireHead": "img_lih21" "fireHead": "img_lih21"
}, },
"4": { "4": {
"type": 1,
"id": 4, "id": 4,
"type": 1,
"name": "playerModel_name_4", "name": "playerModel_name_4",
"head": 100021, "head": 100021,
"img": 100021, "img": 100021,
@ -73,4 +72,3 @@
"fireHead": "img_lih11" "fireHead": "img_lih11"
} }
} }
}

199
src/json/tuisonglibao.json
View File

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

4
src/jsonType.ts
View File

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

63
src/public/user.ts
View File

@ -33,11 +33,10 @@ export const defaultUserAppend: playerAppend = {
head: {id: "1", time: -1}, head: {id: "1", time: -1},
headFrame: {id: "1", time: -1}, headFrame: {id: "1", time: -1},
chatFrame: {id: "1", time: -1}, chatFrame: {id: "1", time: -1},
upModel: {id: "1", time: -1},
model: { model: {
1: {id: "1", time: -1}, 1: {id: "1", time: -1},
2: { id: "1", time: -1 }, 2: {id: "2", time: -1}
3: { id: "1", time: -1 },
4: { id: "1", time: -1 },
}, },
renown: 0, renown: 0,
wxcLv: { wxcLv: {
@ -73,6 +72,7 @@ export class UserFun {
...defaultUserAttr ...defaultUserAttr
}; };
} }
static async check(gud: ResLogin['gud'], req: ReqLogin) { static async check(gud: ResLogin['gud'], req: ReqLogin) {
let obj: k_v<any> = {}; let obj: k_v<any> = {};
let add: k_v<any> = {}; let add: k_v<any> = {};
@ -229,6 +229,7 @@ export class UserFun {
} }
return return
} }
/**创建账号数据 */ /**创建账号数据 */
static async createUser(client: BaseConnection<ServiceType>, bindUid: string, sid: number): Promise<WithId<OptionalId<ResLogin['gud']>>> { static async createUser(client: BaseConnection<ServiceType>, bindUid: string, sid: number): Promise<WithId<OptionalId<ResLogin['gud']>>> {
// 开启事务 // 开启事务
@ -258,14 +259,17 @@ export class UserFun {
// session.endSession() // 结束事务 // session.endSession() // 结束事务
return gud as WithId<OptionalId<ResLogin['gud']>>; return gud as WithId<OptionalId<ResLogin['gud']>>;
} }
/**获取玩家附带的buff加成 */ /**获取玩家附带的buff加成 */
static getOtherBuff(gud: ResLogin['gud']) { static getOtherBuff(gud: ResLogin['gud']) {
return gud; return gud;
} }
static async getGud(uid: string) { static async getGud(uid: string) {
//return await G.redis.get('user', uid); //return await G.redis.get('user', uid);
return await getGud(uid); return await getGud(uid);
} }
/**激活头像框 */ /**激活头像框 */
static async activeHeadFrame(uid: string, k: string, v: number) { static async activeHeadFrame(uid: string, k: string, v: number) {
let gud: player; let gud: player;
@ -317,6 +321,7 @@ export class UserFun {
G.server.uid_connections[uid]?.refreshPower(); G.server.uid_connections[uid]?.refreshPower();
} }
} }
/**激活聊天框 */ /**激活聊天框 */
static async activeChatFrame(uid: string, k: string, v: number) { static async activeChatFrame(uid: string, k: string, v: number) {
let gud: player; let gud: player;
@ -368,4 +373,56 @@ export class UserFun {
G.server.uid_connections[uid]?.refreshPower(); 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, "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", "name": "model",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -4029,14 +4052,14 @@ export const serviceProto: ServiceProto<ServiceType> = {
} }
}, },
{ {
"id": 6, "id": 7,
"name": "renown", "name": "renown",
"type": { "type": {
"type": "Number" "type": "Number"
} }
}, },
{ {
"id": 7, "id": 8,
"name": "wxcLv", "name": "wxcLv",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -4062,14 +4085,14 @@ export const serviceProto: ServiceProto<ServiceType> = {
} }
}, },
{ {
"id": 8, "id": 9,
"name": "mapId", "name": "mapId",
"type": { "type": {
"type": "Number" "type": "Number"
} }
}, },
{ {
"id": 9, "id": 10,
"name": "shoucangping", "name": "shoucangping",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -4082,14 +4105,14 @@ export const serviceProto: ServiceProto<ServiceType> = {
} }
}, },
{ {
"id": 10, "id": 11,
"name": "useTujianLvPoint", "name": "useTujianLvPoint",
"type": { "type": {
"type": "Number" "type": "Number"
} }
}, },
{ {
"id": 11, "id": 12,
"name": "skills", "name": "skills",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -4102,7 +4125,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
} }
}, },
{ {
"id": 12, "id": 13,
"name": "fightSkills", "name": "fightSkills",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -4115,7 +4138,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
} }
}, },
{ {
"id": 13, "id": 14,
"name": "heroPos", "name": "heroPos",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -4128,21 +4151,21 @@ export const serviceProto: ServiceProto<ServiceType> = {
} }
}, },
{ {
"id": 14, "id": 15,
"name": "ghId", "name": "ghId",
"type": { "type": {
"type": "String" "type": "String"
} }
}, },
{ {
"id": 15, "id": 16,
"name": "ghName", "name": "ghName",
"type": { "type": {
"type": "String" "type": "String"
} }
}, },
{ {
"id": 16, "id": 17,
"name": "ghLevel", "name": "ghLevel",
"type": { "type": {
"type": "Reference", "type": "Reference",
@ -4150,7 +4173,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
} }
}, },
{ {
"id": 17, "id": 18,
"name": "ghwz", "name": "ghwz",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -4164,7 +4187,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 18, "id": 19,
"name": "ghExitTime", "name": "ghExitTime",
"type": { "type": {
"type": "Number" "type": "Number"
@ -4172,7 +4195,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 19, "id": 20,
"name": "loginTime", "name": "loginTime",
"type": { "type": {
"type": "Number" "type": "Number"
@ -4180,7 +4203,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 20, "id": 21,
"name": "logoutTime", "name": "logoutTime",
"type": { "type": {
"type": "Number" "type": "Number"
@ -4188,7 +4211,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 21, "id": 22,
"name": "cTime", "name": "cTime",
"type": { "type": {
"type": "Number" "type": "Number"
@ -4196,7 +4219,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 22, "id": 23,
"name": "loginDays", "name": "loginDays",
"type": { "type": {
"type": "Number" "type": "Number"
@ -4204,7 +4227,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 23, "id": 24,
"name": "serverName", "name": "serverName",
"type": { "type": {
"type": "String" "type": "String"
@ -4212,7 +4235,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 24, "id": 25,
"name": "sid", "name": "sid",
"type": { "type": {
"type": "Number" "type": "Number"
@ -4220,7 +4243,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 25, "id": 26,
"name": "onlineTime", "name": "onlineTime",
"type": { "type": {
"type": "Number" "type": "Number"
@ -4228,7 +4251,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 26, "id": 27,
"name": "newonlinetime", "name": "newonlinetime",
"type": { "type": {
"type": "Number" "type": "Number"
@ -4236,7 +4259,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 27, "id": 28,
"name": "isNpc", "name": "isNpc",
"type": { "type": {
"type": "Boolean" "type": "Boolean"
@ -4244,7 +4267,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 28, "id": 29,
"name": "matrix", "name": "matrix",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -4258,7 +4281,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 29, "id": 30,
"name": "matrixPos", "name": "matrixPos",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -4278,7 +4301,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 30, "id": 31,
"name": "selectMatrix", "name": "selectMatrix",
"type": { "type": {
"type": "String" "type": "String"
@ -4286,7 +4309,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 31, "id": 32,
"name": "fightHeros", "name": "fightHeros",
"type": { "type": {
"type": "Array", "type": "Array",
@ -4297,7 +4320,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 32, "id": 33,
"name": "helpHeros", "name": "helpHeros",
"type": { "type": {
"type": "Array", "type": "Array",
@ -4374,7 +4397,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 33, "id": 34,
"name": "changeNameNum", "name": "changeNameNum",
"type": { "type": {
"type": "Number" "type": "Number"
@ -4382,7 +4405,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 34, "id": 35,
"name": "peijianUnlock", "name": "peijianUnlock",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -4396,7 +4419,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 35, "id": 36,
"name": "headFrames", "name": "headFrames",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -4410,7 +4433,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 36, "id": 37,
"name": "chatFrames", "name": "chatFrames",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -5222,6 +5245,29 @@ export const serviceProto: ServiceProto<ServiceType> = {
}, },
{ {
"id": 5, "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", "name": "model",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -5250,14 +5296,14 @@ export const serviceProto: ServiceProto<ServiceType> = {
} }
}, },
{ {
"id": 6, "id": 7,
"name": "renown", "name": "renown",
"type": { "type": {
"type": "Number" "type": "Number"
} }
}, },
{ {
"id": 7, "id": 8,
"name": "wxcLv", "name": "wxcLv",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -5283,14 +5329,14 @@ export const serviceProto: ServiceProto<ServiceType> = {
} }
}, },
{ {
"id": 8, "id": 9,
"name": "mapId", "name": "mapId",
"type": { "type": {
"type": "Number" "type": "Number"
} }
}, },
{ {
"id": 9, "id": 10,
"name": "shoucangping", "name": "shoucangping",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -5303,14 +5349,14 @@ export const serviceProto: ServiceProto<ServiceType> = {
} }
}, },
{ {
"id": 10, "id": 11,
"name": "useTujianLvPoint", "name": "useTujianLvPoint",
"type": { "type": {
"type": "Number" "type": "Number"
} }
}, },
{ {
"id": 11, "id": 12,
"name": "skills", "name": "skills",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -5323,7 +5369,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
} }
}, },
{ {
"id": 12, "id": 13,
"name": "fightSkills", "name": "fightSkills",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -5336,7 +5382,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
} }
}, },
{ {
"id": 13, "id": 14,
"name": "heroPos", "name": "heroPos",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -5349,21 +5395,21 @@ export const serviceProto: ServiceProto<ServiceType> = {
} }
}, },
{ {
"id": 14, "id": 15,
"name": "ghId", "name": "ghId",
"type": { "type": {
"type": "String" "type": "String"
} }
}, },
{ {
"id": 15, "id": 16,
"name": "ghName", "name": "ghName",
"type": { "type": {
"type": "String" "type": "String"
} }
}, },
{ {
"id": 16, "id": 17,
"name": "ghLevel", "name": "ghLevel",
"type": { "type": {
"type": "Reference", "type": "Reference",
@ -5371,7 +5417,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
} }
}, },
{ {
"id": 17, "id": 18,
"name": "ghwz", "name": "ghwz",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -5385,7 +5431,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 18, "id": 19,
"name": "ghExitTime", "name": "ghExitTime",
"type": { "type": {
"type": "Number" "type": "Number"
@ -5393,7 +5439,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 19, "id": 20,
"name": "loginTime", "name": "loginTime",
"type": { "type": {
"type": "Number" "type": "Number"
@ -5401,7 +5447,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 20, "id": 21,
"name": "logoutTime", "name": "logoutTime",
"type": { "type": {
"type": "Number" "type": "Number"
@ -5409,7 +5455,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 21, "id": 22,
"name": "cTime", "name": "cTime",
"type": { "type": {
"type": "Number" "type": "Number"
@ -5417,7 +5463,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 22, "id": 23,
"name": "loginDays", "name": "loginDays",
"type": { "type": {
"type": "Number" "type": "Number"
@ -5425,7 +5471,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 23, "id": 24,
"name": "serverName", "name": "serverName",
"type": { "type": {
"type": "String" "type": "String"
@ -5433,7 +5479,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 24, "id": 25,
"name": "sid", "name": "sid",
"type": { "type": {
"type": "Number" "type": "Number"
@ -5441,7 +5487,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 25, "id": 26,
"name": "onlineTime", "name": "onlineTime",
"type": { "type": {
"type": "Number" "type": "Number"
@ -5449,7 +5495,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 26, "id": 27,
"name": "newonlinetime", "name": "newonlinetime",
"type": { "type": {
"type": "Number" "type": "Number"
@ -5457,7 +5503,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 27, "id": 28,
"name": "isNpc", "name": "isNpc",
"type": { "type": {
"type": "Boolean" "type": "Boolean"
@ -5465,7 +5511,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 28, "id": 29,
"name": "matrix", "name": "matrix",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -5479,7 +5525,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 29, "id": 30,
"name": "matrixPos", "name": "matrixPos",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -5499,7 +5545,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 30, "id": 31,
"name": "selectMatrix", "name": "selectMatrix",
"type": { "type": {
"type": "String" "type": "String"
@ -5507,7 +5553,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 31, "id": 32,
"name": "fightHeros", "name": "fightHeros",
"type": { "type": {
"type": "Array", "type": "Array",
@ -5518,7 +5564,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 32, "id": 33,
"name": "helpHeros", "name": "helpHeros",
"type": { "type": {
"type": "Array", "type": "Array",
@ -5595,7 +5641,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 33, "id": 34,
"name": "changeNameNum", "name": "changeNameNum",
"type": { "type": {
"type": "Number" "type": "Number"
@ -5603,7 +5649,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 34, "id": 35,
"name": "peijianUnlock", "name": "peijianUnlock",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -5617,7 +5663,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 35, "id": 36,
"name": "headFrames", "name": "headFrames",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -5631,7 +5677,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 36, "id": 37,
"name": "chatFrames", "name": "chatFrames",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -23131,6 +23177,29 @@ export const serviceProto: ServiceProto<ServiceType> = {
}, },
{ {
"id": 5, "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", "name": "model",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -23159,14 +23228,14 @@ export const serviceProto: ServiceProto<ServiceType> = {
} }
}, },
{ {
"id": 6, "id": 7,
"name": "renown", "name": "renown",
"type": { "type": {
"type": "Number" "type": "Number"
} }
}, },
{ {
"id": 7, "id": 8,
"name": "wxcLv", "name": "wxcLv",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -23192,14 +23261,14 @@ export const serviceProto: ServiceProto<ServiceType> = {
} }
}, },
{ {
"id": 8, "id": 9,
"name": "mapId", "name": "mapId",
"type": { "type": {
"type": "Number" "type": "Number"
} }
}, },
{ {
"id": 9, "id": 10,
"name": "shoucangping", "name": "shoucangping",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -23212,14 +23281,14 @@ export const serviceProto: ServiceProto<ServiceType> = {
} }
}, },
{ {
"id": 10, "id": 11,
"name": "useTujianLvPoint", "name": "useTujianLvPoint",
"type": { "type": {
"type": "Number" "type": "Number"
} }
}, },
{ {
"id": 11, "id": 12,
"name": "skills", "name": "skills",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -23232,7 +23301,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
} }
}, },
{ {
"id": 12, "id": 13,
"name": "fightSkills", "name": "fightSkills",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -23245,7 +23314,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
} }
}, },
{ {
"id": 13, "id": 14,
"name": "heroPos", "name": "heroPos",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -23258,21 +23327,21 @@ export const serviceProto: ServiceProto<ServiceType> = {
} }
}, },
{ {
"id": 14, "id": 15,
"name": "ghId", "name": "ghId",
"type": { "type": {
"type": "String" "type": "String"
} }
}, },
{ {
"id": 15, "id": 16,
"name": "ghName", "name": "ghName",
"type": { "type": {
"type": "String" "type": "String"
} }
}, },
{ {
"id": 16, "id": 17,
"name": "ghLevel", "name": "ghLevel",
"type": { "type": {
"type": "Reference", "type": "Reference",
@ -23280,7 +23349,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
} }
}, },
{ {
"id": 17, "id": 18,
"name": "ghwz", "name": "ghwz",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -23294,7 +23363,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 18, "id": 19,
"name": "ghExitTime", "name": "ghExitTime",
"type": { "type": {
"type": "Number" "type": "Number"
@ -23302,7 +23371,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 19, "id": 20,
"name": "loginTime", "name": "loginTime",
"type": { "type": {
"type": "Number" "type": "Number"
@ -23310,7 +23379,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 20, "id": 21,
"name": "logoutTime", "name": "logoutTime",
"type": { "type": {
"type": "Number" "type": "Number"
@ -23318,7 +23387,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 21, "id": 22,
"name": "cTime", "name": "cTime",
"type": { "type": {
"type": "Number" "type": "Number"
@ -23326,7 +23395,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 22, "id": 23,
"name": "loginDays", "name": "loginDays",
"type": { "type": {
"type": "Number" "type": "Number"
@ -23334,7 +23403,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 23, "id": 24,
"name": "serverName", "name": "serverName",
"type": { "type": {
"type": "String" "type": "String"
@ -23342,7 +23411,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 24, "id": 25,
"name": "sid", "name": "sid",
"type": { "type": {
"type": "Number" "type": "Number"
@ -23350,7 +23419,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 25, "id": 26,
"name": "onlineTime", "name": "onlineTime",
"type": { "type": {
"type": "Number" "type": "Number"
@ -23358,7 +23427,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 26, "id": 27,
"name": "newonlinetime", "name": "newonlinetime",
"type": { "type": {
"type": "Number" "type": "Number"
@ -23366,7 +23435,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 27, "id": 28,
"name": "isNpc", "name": "isNpc",
"type": { "type": {
"type": "Boolean" "type": "Boolean"
@ -23374,7 +23443,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 28, "id": 29,
"name": "matrix", "name": "matrix",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -23388,7 +23457,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 29, "id": 30,
"name": "matrixPos", "name": "matrixPos",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -23408,7 +23477,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 30, "id": 31,
"name": "selectMatrix", "name": "selectMatrix",
"type": { "type": {
"type": "String" "type": "String"
@ -23416,7 +23485,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 31, "id": 32,
"name": "fightHeros", "name": "fightHeros",
"type": { "type": {
"type": "Array", "type": "Array",
@ -23427,7 +23496,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 32, "id": 33,
"name": "helpHeros", "name": "helpHeros",
"type": { "type": {
"type": "Array", "type": "Array",
@ -23504,7 +23573,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 33, "id": 34,
"name": "changeNameNum", "name": "changeNameNum",
"type": { "type": {
"type": "Number" "type": "Number"
@ -23512,7 +23581,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 34, "id": 35,
"name": "peijianUnlock", "name": "peijianUnlock",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -23526,7 +23595,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 35, "id": 36,
"name": "headFrames", "name": "headFrames",
"type": { "type": {
"type": "Interface", "type": "Interface",
@ -23540,7 +23609,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
"optional": true "optional": true
}, },
{ {
"id": 36, "id": 37,
"name": "chatFrames", "name": "chatFrames",
"type": { "type": {
"type": "Interface", "type": "Interface",

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

@ -94,6 +94,13 @@ export type playerAppend = {
}; };
/**名字 */ /**名字 */
name: string; name: string;
/**正在使用的造型 */
upModel: {
/**id */
id: string,
/**到期时间戳 -1：永久 */
time: number;
};
/**造型 */ /**造型 */
model: { model: {
[k: string]: { [k: string]: {

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

@ -4,21 +4,38 @@ export class UserShared {
return Array.from(arguments).filter(s => s != '').join('_'); 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 * @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>; }>) { 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 jsonName = 'player' + type.slice(0, 1).toLocaleUpperCase() + type.slice(1);
const json = G.gc[jsonName] as any; 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]; 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] == '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] == '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] == '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 if (conf.cond[0] == 'model') return Object.values(collection.model).find(i => i.id == conf.cond[1]);
else return false; else return false;
} }

1122
tsbufferIndex.js Normal file
View File

File diff suppressed because it is too large Load Diff