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

Merge branch 'feature/skin' into dev

Browse Source
This commit is contained in:
xichaoyin 2024-01-05 20:09:26 +08:00
commit 3f36fa83ab
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api_s2c/heroskin/ApiWear.ts
View File

@ -17,7 +17,7 @@ export default async function (call: ApiCall<ReqWear, ResWear>) {
} }
let skinconf = G.gc.heroSkin[call.req.skid]; let skinconf = G.gc.heroSkin[call.req.skid];
if (skinconf.heroid != hero.heroId) { // 皮肤不属于该英雄 if (skinconf.heroId != hero.heroId) { // 皮肤不属于该英雄
call.error(lng.hero_21); call.error(lng.hero_21);
return; return;
} }

2
src/jsonType.ts
View File

@ -1814,7 +1814,7 @@ type gc_hero_skin = {
/**皮肤id*/ /**皮肤id*/
id: number id: number
/**干部id*/ /**干部id*/
heroid: number heroId: number
/**皮肤品质*/ /**皮肤品质*/
colour: number colour: number
/**摸到重复时转换*/ /**摸到重复时转换*/

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

@ -288,7 +288,7 @@ export class HeroShared {
if (otherBuff?.heroskin) { if (otherBuff?.heroskin) {
for (let skinId in otherBuff.heroskin) { for (let skinId in otherBuff.heroskin) {
let skinConf = G.gc.heroSkin[skinId]; let skinConf = G.gc.heroSkin[skinId];
if (skinConf.heroid != hero.heroId) console; if (skinConf.heroId != hero.heroId) console;
PublicShared.mergeProperty(buff, HeroSkinFun.calcBuff( PublicShared.mergeProperty(buff, HeroSkinFun.calcBuff(
skinId, otherBuff.heroskin[skinId] skinId, otherBuff.heroskin[skinId]
)); ));