Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
a4fa877f6b
|
@ -557,7 +557,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 325, y: 16.8}
|
||||
m_AnchoredPosition: {x: 331, y: 16.8}
|
||||
m_SizeDelta: {x: 465.69, y: 40}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2496443724771672119
|
||||
|
@ -717,7 +717,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 298.5, y: -65.2}
|
||||
m_AnchoredPosition: {x: 313, y: -65.2}
|
||||
m_SizeDelta: {x: 465.69, y: 40}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2785456978225658465
|
||||
|
@ -1031,7 +1031,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 221.8, y: 16.8}
|
||||
m_AnchoredPosition: {x: 231.1, y: 16.8}
|
||||
m_SizeDelta: {x: 108.1, y: 40}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4594226205978946961
|
||||
|
@ -1936,7 +1936,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 45.8, y: -60.3}
|
||||
m_AnchoredPosition: {x: 52, y: -60.3}
|
||||
m_SizeDelta: {x: 68.27, y: 68.27}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &9112862323949206398
|
||||
|
@ -2643,7 +2643,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 298.5, y: -65.2}
|
||||
m_AnchoredPosition: {x: 313, y: -65.2}
|
||||
m_SizeDelta: {x: 465.69, y: 40}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8286325140569660708
|
||||
|
@ -2917,7 +2917,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 45.8, y: -60.3}
|
||||
m_AnchoredPosition: {x: 52, y: -60.3}
|
||||
m_SizeDelta: {x: 68.27, y: 68.27}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &303406717516978758
|
||||
|
@ -3107,7 +3107,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 221.8, y: 16.8}
|
||||
m_AnchoredPosition: {x: 232, y: 16.8}
|
||||
m_SizeDelta: {x: 108.1, y: 40}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6567475131825688234
|
||||
|
@ -3410,7 +3410,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 325, y: 16.8}
|
||||
m_AnchoredPosition: {x: 331.2, y: 16.8}
|
||||
m_SizeDelta: {x: 465.69, y: 40}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7185823374786649970
|
||||
|
|
|
@ -415,6 +415,14 @@ end
|
|||
|
||||
--把英雄星级父对象和星级传过来 type 1 第6-11个预设 type 2 第12-17个预设 type 3 第18-24个预设
|
||||
function SetHeroStars(spLoader, starGrid, star, type,_starSize,_scale,_pivot,rotation)
|
||||
local pos = starGrid:GetComponent("RectTransform").anchoredPosition3D
|
||||
pos.y = -1.03
|
||||
starGrid:GetComponent("RectTransform").anchoredPosition3D = pos
|
||||
local horizonta = starGrid:GetComponent("HorizontalLayoutGroup")
|
||||
if not horizonta then
|
||||
horizonta = starGrid:AddComponent(typeof(UnityEngine.UI.HorizontalLayoutGroup))
|
||||
end
|
||||
horizonta.childAlignment = "LowerLeft"
|
||||
local starSize
|
||||
if not _starSize and type == 3 then
|
||||
--第一个值代表缩放,第二个值代表y轴移动到的y轴的位置
|
||||
|
|
Loading…
Reference in New Issue