From d58e38fcea466608acf1a81d495d4a3f9c90c81f Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sat, 9 Oct 2021 12:04:01 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90ID1018684=E3=80=91=20=E3=80=90?= =?UTF-8?q?=E5=A5=BD=E6=84=9F=E5=BA=A6=E3=80=91=E5=A5=BD=E6=84=9F=E5=BA=A6?= =?UTF-8?q?=E6=8C=82=E6=9C=BA=E5=8A=A0=E6=88=90=E6=B2=A1=E5=9C=A8=E6=8C=82?= =?UTF-8?q?=E6=9C=BA=E5=A5=96=E5=8A=B1=E9=A2=84=E8=A7=88=E5=A4=84=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 7 +++++++ .../~Lua/Modules/Fight/FightAreaRewardPopup.lua | 9 +++++++++ .../~Lua/Modules/Fight/FightPointPassMainPanel.lua | 9 +++++++++ .../~Lua/Modules/Fight/FightPointPassManager.lua | 6 +----- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 8238bc7945..d7631a957f 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2897,3 +2897,10 @@ RevertPreConfigure={ [RecruitType.Single]=5, [RecruitType.Ten]=6, } + + +_ItemIdToVipPrivilege = { + [14] = 1, + [3] = 1, + [17] = 27, +} \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardPopup.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardPopup.lua index 4dd20d8cc6..2b3da4d1c1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardPopup.lua @@ -187,6 +187,15 @@ function this.ItemAdapter(node, data) -- local txt = Util.GetGameObject(node, "context"):GetComponent("Text") local addValue = FightPointPassManager.GetItemVipValue(data[1]) + local totalCurNum,totalLv,totalNum = LikabilityManager.GetTotalHeroLikeLv(-1) + local prolist = {} + if totalLv > 0 then + prolist = LikabilityManager.GetPrivilageProData(1,totalLv,totalLv) + local priId = _ItemIdToVipPrivilege[data[1]] + if prolist[priId] then + addValue = addValue + (prolist[priId]/10000) + end + end local baseValue = string.format(Language[10603], data[2]) if addValue - 1 <= 0 then txt.text = baseValue diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua index d5700aad5b..f549e53258 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua @@ -592,6 +592,15 @@ function this.IntiReward() this.rewardList[i].icon.sprite = SetIcon(this.spLoader, rewardData[i][1]) local addValue = FightPointPassManager.GetItemVipValue(rewardData[i][1]) + local totalCurNum,totalLv,totalNum = LikabilityManager.GetTotalHeroLikeLv(-1) + local prolist = {} + if totalLv > 0 then + prolist = LikabilityManager.GetPrivilageProData(1,totalLv,totalLv) + local priId = _ItemIdToVipPrivilege[rewardData[i][1]] + if prolist[priId] then + addValue = addValue + (prolist[priId]/10000) + end + end local baseValue = rewardData[i][2] if addValue - 1 <= 0 then diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua index 4be54f9456..2d979ad137 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua @@ -6,11 +6,7 @@ local Huo_Dong_Diao_Luo = ConfigManager.GetConfig(ConfigName.ActivityDropReward) local rewardGroupConfig = ConfigManager.GetConfig(ConfigName.RewardGroup) this.talkingTime = 0 --对话时间 -- 挂机物品栏位对应vip数值加成特权 -local _ItemIdToVipPrivilege = { - [14] = 1, - [3] = 1, - [17] = 27, -} + -- 战斗胜利后是否已经更新过ID local hadUpdate = false