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

Merge branch 'feature/weiwang' into dev

Browse Source
This commit is contained in:
xichaoyin 2024-01-04 16:13:12 +08:00
commit a0d06cdaf4
5 changed files with 91 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1316,6 +1316,20 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
"optional": true
},
{
"id": 38,
"name": "weiwang",
"type": {
"type": "Interface",
"indexSignature": {
"keyType": "String",
"type": {
"type": "Number"
}
}
},
"optional": true
}
]
},

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

@ -2637,6 +2637,20 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
"optional": true
},
{
"id": 38,
"name": "weiwang",
"type": {
"type": "Interface",
"indexSignature": {
"keyType": "String",
"type": {
"type": "Number"
}
}
},
"optional": true
}
]
},

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

@ -4585,6 +4585,20 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
"optional": true
},
{
"id": 38,
"name": "weiwang",
"type": {
"type": "Interface",
"indexSignature": {
"keyType": "String",
"type": {
"type": "Number"
}
}
},
"optional": true
}
]
},
@ -5829,6 +5843,20 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
"optional": true
},
{
"id": 38,
"name": "weiwang",
"type": {
"type": "Interface",
"indexSignature": {
"keyType": "String",
"type": {
"type": "Number"
}
}
},
"optional": true
}
]
},
@ -24380,6 +24408,20 @@ export const serviceProto: ServiceProto<ServiceType> = {
}
},
"optional": true
},
{
"id": 38,
"name": "weiwang",
"type": {
"type": "Interface",
"indexSignature": {
"keyType": "String",
"type": {
"type": "Number"
}
}
},
"optional": true
}
]
},

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

@ -193,4 +193,6 @@ export type playerAppend = {
chatFrames?: {
[id: string]: number;
};
/**威望额外属性*/
weiwang?: { [k: string]: number };
};

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

@ -278,6 +278,11 @@ export class HeroShared {
}
}
// 威望加成计算
if (otherBuff?.weiwang) {
PublicShared.mergeProperty(buff, otherBuff?.weiwang || {});
}
//最后进行加成属性计算
for (let k in buff) {
if (k.indexOf('pro') == -1) continue;