diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardPopup.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardPopup.lua index 98d2e19ef6..4dd20d8cc6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardPopup.lua @@ -192,7 +192,7 @@ function this.ItemAdapter(node, data) txt.text = baseValue else local valueShow = (addValue - 1) * data[2] - txt.text = string.format("%s\n(+%s)",baseValue,valueShow) + txt.text = string.format("%s\n(+%s)",baseValue,valueShow) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua index 0629394cea..d5700aad5b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua @@ -598,7 +598,7 @@ function this.IntiReward() this.rewardList[i].text.text = "+"..rewardData[i][2] else local valueShow = (addValue - 1) * baseValue - this.rewardList[i].text.text = string.format("+%s\n(+%s)",baseValue,valueShow) + this.rewardList[i].text.text = string.format("+%s\n(+%s)",baseValue,valueShow) end end end diff --git a/Assets/ManagedResources/~Lua/Modules/Likability/LikabilityManager.lua b/Assets/ManagedResources/~Lua/Modules/Likability/LikabilityManager.lua index fcb1d71d1f..74e56415bf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Likability/LikabilityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Likability/LikabilityManager.lua @@ -359,7 +359,7 @@ function this.GetViewProData(indexType,add,lv,title1,title2,subtitle1,subtitle2, if list[i].lv ~= 0 then local color = "" if lv >= list[i].lv then - color = "5dc446" + color = "00FF00" else color = "fdf5e5" end @@ -372,7 +372,7 @@ function this.GetViewProData(indexType,add,lv,title1,title2,subtitle1,subtitle2, end end else - local color = "5dc446" + local color = "00FF00" if title2 and title2 ~= "" then table.insert(data.prolist,string.format(title2,color,lv,num,totalNum)) end diff --git a/Assets/ManagedResources/~Lua/Modules/Likability/LikeAbilityPanel.lua b/Assets/ManagedResources/~Lua/Modules/Likability/LikeAbilityPanel.lua index b45aeff056..5e7d490255 100644 --- a/Assets/ManagedResources/~Lua/Modules/Likability/LikeAbilityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Likability/LikeAbilityPanel.lua @@ -3,7 +3,7 @@ LikeAbilityPanel = Inherit(BasePanel) --全体生命 --白色 --特权--橙色 --总好感度属性: --黄色 ---+500 --绿色 +--+500 --绿色 local pos = { ["h_haogandu_1"] = {mask = Vector3.zero,icon = Vector3.New(-3.4,0,0)} , ["h_haogandu_2"] = {mask = Vector3.zero,icon = Vector3.New(-3.4,0,0)} , diff --git a/Assets/ManagedResources/~Lua/Modules/Likability/LikeabilityPopup.lua b/Assets/ManagedResources/~Lua/Modules/Likability/LikeabilityPopup.lua index b5d492a6b1..3f1d15c3f0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Likability/LikeabilityPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Likability/LikeabilityPopup.lua @@ -3,7 +3,7 @@ LikeabilityPopup = Inherit(BasePanel) --全体生命 --白色 --特权--橙色 --总好感度属性: --黄色 ---+500 --绿色 +--+500 --绿色 local pos = { ["h_haogandu_1"] = {mask = Vector3.zero,icon = Vector3.New(-3.4,0,0)} , ["h_haogandu_2"] = {mask = Vector3.zero,icon = Vector3.New(-3.4,0,0)} , @@ -71,7 +71,7 @@ function LikeabilityPopup:UpdateTopLayoutPanel() self.progress.text = "好感度最佳" self.likeabilitymask.fillAmount = 1 else - self.progress.text = string.format("%s/%s",num,totalNum) + self.progress.text = string.format("%s/%s",num,totalNum) self.likeabilitymask.fillAmount = num/totalNum end self:UpDataProList(lv) diff --git a/Assets/ManagedResources/~Lua/Modules/Likability/RoleLikeabilityPopup.lua b/Assets/ManagedResources/~Lua/Modules/Likability/RoleLikeabilityPopup.lua index 8961c680cb..9bfe1e568b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Likability/RoleLikeabilityPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Likability/RoleLikeabilityPopup.lua @@ -3,7 +3,7 @@ RoleLikeabilityPopup = Inherit(BasePanel) --全体生命 --白色 --特权--橙色 --总好感度属性: --黄色 ---+500 --绿色 +--+500 --绿色 function RoleLikeabilityPopup:InitComponent() self.spLoader = SpriteLoader.New() self.btnBack = Util.GetGameObject(self.transform, "BackMask")