Merge branch 'feature/weiwang' into dev

This commit is contained in:
xichaoyin 2024-01-04 18:08:20 +08:00
commit 7aaf803fb3

View File

@ -280,8 +280,8 @@ export class HeroShared {
} }
// 威望加成计算 // 威望加成计算
if (otherBuff?.weiwang) { if (otherBuff?.weiwangbuff) {
PublicShared.mergeProperty(buff, otherBuff?.weiwang || {}); PublicShared.mergeProperty(buff, otherBuff?.weiwangbuff || {});
} }
// 计算皮肤buff // 计算皮肤buff