diff --git a/excel/item.xlsx b/excel/item.xlsx index f5c902d..a3cd8f7 100644 Binary files a/excel/item.xlsx and b/excel/item.xlsx differ diff --git a/src/ServerStorage/Proxy/PlayerInfoProxy.luau b/src/ServerStorage/Proxy/PlayerInfoProxy.luau index f149c79..6321859 100644 --- a/src/ServerStorage/Proxy/PlayerInfoProxy.luau +++ b/src/ServerStorage/Proxy/PlayerInfoProxy.luau @@ -345,9 +345,9 @@ function PlayerInfoProxy:GetPlayerUpgradeAttributes(Player: Player) -- attributes[attributeData["effectAttribute"]] = attributeData["lvAdd"][1] + (AttributeLv - 1) * attributeData["lvAdd"][2] local effectAttribute = attributeData["effectAttribute"] if effectAttribute == "attack" or effectAttribute == "hp" then - attributes[effectAttribute] = math.floor(attributeData["lvAdd"][1] * (AttributeLv ^ (attributeData["lvAdd"][2] / 10000)) - attributeData["lvAdd"][1]) + attributes[effectAttribute] = math.floor(attributeData["lvAdd"][1] * ((attributeData["lvAdd"][2] / 10000) ^ AttributeLv ) - attributeData["lvAdd"][1]) else - attributes[effectAttribute] = math.floor(attributeData["lvAdd"][1] ^ (AttributeLv - 1) * attributeData["lvAdd"][2] / 10000) + attributes[effectAttribute] = math.floor(attributeData["lvAdd"][1] *AttributeLv * attributeData["lvAdd"][2] / 10000) end end return attributes diff --git a/src/StarterPlayerScripts/UI/Windows/AttributeLvupWindow/AttributeLvupShow.luau b/src/StarterPlayerScripts/UI/Windows/AttributeLvupWindow/AttributeLvupShow.luau index cde052e..52738a2 100644 --- a/src/StarterPlayerScripts/UI/Windows/AttributeLvupWindow/AttributeLvupShow.luau +++ b/src/StarterPlayerScripts/UI/Windows/AttributeLvupWindow/AttributeLvupShow.luau @@ -68,7 +68,11 @@ function AttributeLvupShow:Refresh() else self.Variables._btnUpgrade.Text = self.Data.cost[2] + self.Data.cost[3] * nowLv -- 属性值显示(下一级) - self.Variables._tmpValue.Text = self.Data.lvAdd[1] + self.Data.lvAdd[2] * nowLv + if self.Data.id == 1 or self.Data.id == 2 then + self.Variables._tmpValue.Text = math.floor(self.Data.lvAdd[1] * ((self.Data.lvAdd[2] / 10000) ^ nowLv)) + else + self.Variables._tmpValue.Text = self.Data.lvAdd[1] + self.Data.lvAdd[2] * nowLv + end end end diff --git a/src/StarterPlayerScripts/UI/Windows/EquipmentDetailWindow/init.luau b/src/StarterPlayerScripts/UI/Windows/EquipmentDetailWindow/init.luau index 02bc048..c74ee02 100644 --- a/src/StarterPlayerScripts/UI/Windows/EquipmentDetailWindow/init.luau +++ b/src/StarterPlayerScripts/UI/Windows/EquipmentDetailWindow/init.luau @@ -194,7 +194,7 @@ function EquipmentDetailWindow:OnOpenWindow() local equipmentData = Utils:GetIdDataFromJson(JsonItemProp, equipmentInstance:GetAttribute("orgId")) self.Variables["_imgIcon"].Image = Localization:GetImageData(equipmentData.iconId) self.Variables["_tmpName"].Text = Localization:GetLanguageData(equipmentData.nameId) - self.Variables["_tmpQuality"].Text = Localization:GetColoredEquipmentQualityDesc(equipmentData.quality) + self.Variables["_tmpQuality"].Text = Localization:GetColoredEquipmentQualityDesc(equipmentInstance:GetAttribute("quality")) self.Variables["_tmpCombatValue"].Text = 0 local equipmentData = Utils:GetIdDataFromJson(JsonEquipment, equipmentInstance:GetAttribute("orgId"))