好感度修改提交
parent
a572de49a7
commit
f0eb2a75ab
|
@ -12389,8 +12389,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -35}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: -40}
|
||||
m_SizeDelta: {x: 0, y: 35}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &2578050656831745031
|
||||
CanvasRenderer:
|
||||
|
@ -12430,7 +12430,7 @@ MonoBehaviour:
|
|||
m_Alignment: 0
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text:
|
||||
|
|
|
@ -92,7 +92,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &148015055094331855
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -109,7 +109,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 52.877026, y: -459.2291}
|
||||
m_AnchoredPosition: {x: 52.877014, y: -459.2291}
|
||||
m_SizeDelta: {x: 632.2, y: 2}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &5559883810871526586
|
||||
|
@ -207,7 +207,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 369.8, y: -171.8}
|
||||
m_AnchoredPosition: {x: 369.8, y: -171.79999}
|
||||
m_SizeDelta: {x: 406, y: 268}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8643454709222241501
|
||||
|
@ -334,7 +334,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 361.65, y: -0.000024327841}
|
||||
m_AnchoredPosition: {x: 361.65, y: -0.000009119595}
|
||||
m_SizeDelta: {x: 723.3, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!114 &7575507291051525301
|
||||
|
@ -976,7 +976,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: -4.95, y: -45.1}
|
||||
m_AnchoredPosition: {x: -4.95, y: -45.100006}
|
||||
m_SizeDelta: {x: 702.3, y: 90.1}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6473730257751037112
|
||||
|
@ -1985,7 +1985,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &7647837852959861211
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -435,6 +435,7 @@ function this.SetProvalue(prolist,proType,tag,nextLv,indexType,_color)
|
|||
end
|
||||
local newProList = {}
|
||||
local str = ""
|
||||
LogError("#prolist=="..#prolist)
|
||||
for k,v in pairs(prolist) do
|
||||
local str1 = ""
|
||||
if proType == 1 then
|
||||
|
@ -459,7 +460,9 @@ function this.SetProvalue(prolist,proType,tag,nextLv,indexType,_color)
|
|||
end
|
||||
table.insert(newProList,str1)
|
||||
end
|
||||
str = string.format(tag,color1,(newProList[1] or ""),(newProList[2] or ""))
|
||||
|
||||
str = string.format(tag,color1,(newProList[1] or ""),(newProList[2] or ""),(newProList[3] or ""),(newProList[4] or ""))
|
||||
LogError("str==="..str)
|
||||
return str
|
||||
end
|
||||
|
||||
|
|
|
@ -173,13 +173,13 @@ end
|
|||
function LikeAbilityPanel:UpDataProList(lv)
|
||||
-- local pro1 = LikabilityManager.GetViewProData(1,-1,lv,"<color=#fed97f>总好感度属性:</color>","","<color=#%s><color=#fdf5e5>全体%s 全体%s</color></color>","<color=#%s><color=#fc902c>特权:</color>%s</color>",nil)
|
||||
-- local pro2 = LikabilityManager.GetViewProData(1,lv,lv,"<color=#fed97f>当前等级加成:</color>","","<color=#%s><color=#fc902c>属性:</color>%s %s</color>","<color=#%s><color=#fc902c>特权:</color>%s</color>",nil)
|
||||
local pro1 = LikabilityManager.GetViewProData(1,-1,lv,"<color=#fed97f>好感度属性总加成:</color>","","<color=#%s><color=#fdf5e5>全体%s 全体%s</color></color>","",nil)
|
||||
local pro1 = LikabilityManager.GetViewProData(1,-1,lv,"<color=#fed97f>好感度属性总加成:</color>","","<color=#%s><color=#fdf5e5>全体%s 全体%s \n全体%s 全体%s</color></color>","",nil)
|
||||
local pro2 = LikabilityManager.GetViewProData(1,-1,lv,"<color=#fed97f>好感度特权总加成:</color>","","","<color=#%s>%s</color>",nil)
|
||||
for i = 1,#self.proList do
|
||||
self.proList[i].go.gameObject:SetActive(false)
|
||||
end
|
||||
self:UpDataProSingleList(pro1,1)
|
||||
self:UpDataProSingleList(pro2,2)
|
||||
--self:UpDataProSingleList(pro2,2)
|
||||
end
|
||||
|
||||
function LikeAbilityPanel:UpDataProSingleList(data,index)
|
||||
|
|
|
@ -79,13 +79,13 @@ function LikeabilityPopup:UpdateTopLayoutPanel()
|
|||
end
|
||||
|
||||
function LikeabilityPopup:UpDataProList(lv)
|
||||
local pro1 = LikabilityManager.GetViewProData(1,-1,lv,"<color=#fed97f> 总好感度属性:</color>",""," <color=#%s>全体%s\n 全体%s</color>","",lv + 1)
|
||||
local pro2 = LikabilityManager.GetViewProData(1,lv,lv,"<color=#fed97f> 当前等级加成:</color>","<color=#%s>%s级</color>","<color=#%s>属性加成:%s %s</color>","<color=#%s>特权加成:%s</color>",nil,true)
|
||||
local pro1 = LikabilityManager.GetViewProData(1,-1,lv,"<color=#fed97f> 总好感度属性:</color>",""," <color=#%s>全体%s\n 全体%s\n 全体%s\n 全体%s</color>","",lv + 1)
|
||||
--local pro2 = LikabilityManager.GetViewProData(1,lv,lv,"<color=#fed97f> 当前等级加成:</color>","<color=#%s>%s级</color>","<color=#%s>属性加成:%s %s</color>","<color=#%s>特权加成:%s</color>",nil,true)
|
||||
for i = 1,#self.proList do
|
||||
self.proList[i].go.gameObject:SetActive(false)
|
||||
end
|
||||
self:UpDataProSingleList(pro1,1,self.proGrid1)
|
||||
self:UpDataProSingleList(pro2,2,self.proGrid2,lv)
|
||||
--self:UpDataProSingleList(pro2,2,self.proGrid2,lv)
|
||||
end
|
||||
|
||||
function LikeabilityPopup:UpDataProSingleList(data,index,parent,lv)
|
||||
|
|
Loading…
Reference in New Issue