From b5fa2c8ae657b64326abcf407274ca0451d98381 Mon Sep 17 00:00:00 2001 From: luying Date: Fri, 24 Sep 2021 17:48:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=98=E5=8A=9B=EF=BC=9A=E9=9A=8F=E6=9C=BA?= =?UTF-8?q?=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/servers/battle/handler/auctionHandler.ts | 2 +- shared/consts/constModules/abilityConst.ts | 4 ++++ shared/pubUtils/playerCe.ts | 8 ++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/game-server/app/servers/battle/handler/auctionHandler.ts b/game-server/app/servers/battle/handler/auctionHandler.ts index 81dd01c13..5277720e7 100644 --- a/game-server/app/servers/battle/handler/auctionHandler.ts +++ b/game-server/app/servers/battle/handler/auctionHandler.ts @@ -246,7 +246,7 @@ export class AuctionHandler { let rewards = getAuctionRewardByPoolId(poolId); if(!rewards) return resResult(STATUS.WRONG_PARMS); - const result = await genAuction(guildCode, sourceType, sourceCode, serverId, rewards); + const result = await genAuction(guildCode, sourceType, magicWord, serverId, rewards); if (!result) { return resResult(STATUS.WRONG_PARMS); } diff --git a/shared/consts/constModules/abilityConst.ts b/shared/consts/constModules/abilityConst.ts index 2e4c7bc16..1c43a75e6 100644 --- a/shared/consts/constModules/abilityConst.ts +++ b/shared/consts/constModules/abilityConst.ts @@ -102,6 +102,10 @@ export enum SEID_TYPE { TYPE101 = 101, /**属性固定值加成(百分比） */ TYPE102 = 102, + /**基础属性加百分比，除以1000以后加到ratioUp */ + TYPE103 = 103, + /**次级属性的百分比加成，乘以100后加到fixUp */ + TYPE104 = 104, /**复合属性 */ TYPE999 = 999, } diff --git a/shared/pubUtils/playerCe.ts b/shared/pubUtils/playerCe.ts index 5dba10809..d0d4395e3 100644 --- a/shared/pubUtils/playerCe.ts +++ b/shared/pubUtils/playerCe.ts @@ -871,6 +871,14 @@ function addSeidEffect(heroAttrs: CeAttrData[], addSeidList: Array, remo } else { // 次级属性102特殊处理 updateHeroAttr(heroAttrs, ability, { inc: {fixUp: value * multi * HERO_SUB_ATTR_RATIO } }); } + } else if (type == SEID_TYPE.TYPE103) { // 主属性加百分比 + if(ABI_TYPE_MAIN.includes(ability)) { + updateHeroAttr(heroAttrs, ability, { inc: {ratioUp: value / 1000 * multi} }); + } + } else if (type == SEID_TYPE.TYPE104) { // 次级属性加百分比 + if(!ABI_TYPE_MAIN.includes(ability)) { + updateHeroAttr(heroAttrs, ability, { inc: {fixUp: value * 100 * multi * HERO_CE_RATIO } }); + } } } }