绿色修改提交
parent
a62e656d7b
commit
4dfdc507f7
|
@ -192,7 +192,7 @@ function this.ItemAdapter(node, data)
|
||||||
txt.text = baseValue
|
txt.text = baseValue
|
||||||
else
|
else
|
||||||
local valueShow = (addValue - 1) * data[2]
|
local valueShow = (addValue - 1) * data[2]
|
||||||
txt.text = string.format("%s\n<color=#5dc446>(+%s)</color>",baseValue,valueShow)
|
txt.text = string.format("%s\n<color=#00FF00>(+%s)</color>",baseValue,valueShow)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -598,7 +598,7 @@ function this.IntiReward()
|
||||||
this.rewardList[i].text.text = "+"..rewardData[i][2]
|
this.rewardList[i].text.text = "+"..rewardData[i][2]
|
||||||
else
|
else
|
||||||
local valueShow = (addValue - 1) * baseValue
|
local valueShow = (addValue - 1) * baseValue
|
||||||
this.rewardList[i].text.text = string.format("+%s\n<color=#5dc446>(+%s)</color>",baseValue,valueShow)
|
this.rewardList[i].text.text = string.format("+%s\n<color=#00FF00>(+%s)</color>",baseValue,valueShow)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -359,7 +359,7 @@ function this.GetViewProData(indexType,add,lv,title1,title2,subtitle1,subtitle2,
|
||||||
if list[i].lv ~= 0 then
|
if list[i].lv ~= 0 then
|
||||||
local color = ""
|
local color = ""
|
||||||
if lv >= list[i].lv then
|
if lv >= list[i].lv then
|
||||||
color = "5dc446"
|
color = "00FF00"
|
||||||
else
|
else
|
||||||
color = "fdf5e5"
|
color = "fdf5e5"
|
||||||
end
|
end
|
||||||
|
@ -372,7 +372,7 @@ function this.GetViewProData(indexType,add,lv,title1,title2,subtitle1,subtitle2,
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
local color = "5dc446"
|
local color = "00FF00"
|
||||||
if title2 and title2 ~= "" then
|
if title2 and title2 ~= "" then
|
||||||
table.insert(data.prolist,string.format(title2,color,lv,num,totalNum))
|
table.insert(data.prolist,string.format(title2,color,lv,num,totalNum))
|
||||||
end
|
end
|
||||||
|
|
|
@ -3,7 +3,7 @@ LikeAbilityPanel = Inherit(BasePanel)
|
||||||
--<size=32><color=#fdf5e5>全体生命</color></size> --白色
|
--<size=32><color=#fdf5e5>全体生命</color></size> --白色
|
||||||
--<size=32><color=#fc902c>特权</color></size>--橙色
|
--<size=32><color=#fc902c>特权</color></size>--橙色
|
||||||
--<size=32><color=#fed97f>总好感度属性:</color></size> --黄色
|
--<size=32><color=#fed97f>总好感度属性:</color></size> --黄色
|
||||||
--<color=#5dc446>+500</color></size> --绿色
|
--<color=#00FF00>+500</color></size> --绿色
|
||||||
local pos = {
|
local pos = {
|
||||||
["h_haogandu_1"] = {mask = Vector3.zero,icon = Vector3.New(-3.4,0,0)} ,
|
["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)} ,
|
["h_haogandu_2"] = {mask = Vector3.zero,icon = Vector3.New(-3.4,0,0)} ,
|
||||||
|
|
|
@ -3,7 +3,7 @@ LikeabilityPopup = Inherit(BasePanel)
|
||||||
--<size=32><color=#fdf5e5>全体生命</color></size> --白色
|
--<size=32><color=#fdf5e5>全体生命</color></size> --白色
|
||||||
--<size=32><color=#fc902c>特权</color></size>--橙色
|
--<size=32><color=#fc902c>特权</color></size>--橙色
|
||||||
--<size=32><color=#fed97f>总好感度属性:</color></size> --黄色
|
--<size=32><color=#fed97f>总好感度属性:</color></size> --黄色
|
||||||
--<color=#5dc446>+500</color></size> --绿色
|
--<color=#00FF00>+500</color></size> --绿色
|
||||||
local pos = {
|
local pos = {
|
||||||
["h_haogandu_1"] = {mask = Vector3.zero,icon = Vector3.New(-3.4,0,0)} ,
|
["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)} ,
|
["h_haogandu_2"] = {mask = Vector3.zero,icon = Vector3.New(-3.4,0,0)} ,
|
||||||
|
@ -71,7 +71,7 @@ function LikeabilityPopup:UpdateTopLayoutPanel()
|
||||||
self.progress.text = "好感度最佳"
|
self.progress.text = "好感度最佳"
|
||||||
self.likeabilitymask.fillAmount = 1
|
self.likeabilitymask.fillAmount = 1
|
||||||
else
|
else
|
||||||
self.progress.text = string.format("<color=#5dc446>%s</color>/%s",num,totalNum)
|
self.progress.text = string.format("<color=#00FF00>%s</color>/%s",num,totalNum)
|
||||||
self.likeabilitymask.fillAmount = num/totalNum
|
self.likeabilitymask.fillAmount = num/totalNum
|
||||||
end
|
end
|
||||||
self:UpDataProList(lv)
|
self:UpDataProList(lv)
|
||||||
|
|
|
@ -3,7 +3,7 @@ RoleLikeabilityPopup = Inherit(BasePanel)
|
||||||
--<size=32><color=#fdf5e5>全体生命</color></size> --白色
|
--<size=32><color=#fdf5e5>全体生命</color></size> --白色
|
||||||
--<size=32><color=#fc902c>特权</color></size>--橙色
|
--<size=32><color=#fc902c>特权</color></size>--橙色
|
||||||
--<size=32><color=#fed97f>总好感度属性:</color></size> --黄色
|
--<size=32><color=#fed97f>总好感度属性:</color></size> --黄色
|
||||||
--<color=#5dc446>+500</color></size> --绿色
|
--<color=#00FF00>+500</color></size> --绿色
|
||||||
function RoleLikeabilityPopup:InitComponent()
|
function RoleLikeabilityPopup:InitComponent()
|
||||||
self.spLoader = SpriteLoader.New()
|
self.spLoader = SpriteLoader.New()
|
||||||
self.btnBack = Util.GetGameObject(self.transform, "BackMask")
|
self.btnBack = Util.GetGameObject(self.transform, "BackMask")
|
||||||
|
|
Loading…
Reference in New Issue