Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
c5b9a4327a
|
@ -404,7 +404,7 @@ function GetStarOrGodSoulLv(index,data)
|
|||
if data.godSoulLv and data.godSoulLv > 0 then
|
||||
return data.godSoulLv,3
|
||||
elseif data.star > 9 then
|
||||
return data.godSoulLv,2
|
||||
return data.star,2
|
||||
end
|
||||
return data.star,index
|
||||
end
|
||||
|
@ -474,7 +474,7 @@ function SetHeroStars(spLoader, starGrid, star, type,_starSize,_scale,_pivot,rot
|
|||
end
|
||||
elseif star < 6 then
|
||||
for i = 2, 24 do
|
||||
if i < star then
|
||||
if i - 1 <= star then
|
||||
starPre.transform:GetChild(i - 1):GetComponent("Image").sprite = spLoader:LoadSprite(GetHeroStarImage[1])
|
||||
starPre.transform:GetChild(i - 1):GetComponent("RectTransform").sizeDelta = starSize
|
||||
if rotation then
|
||||
|
@ -487,7 +487,7 @@ function SetHeroStars(spLoader, starGrid, star, type,_starSize,_scale,_pivot,rot
|
|||
end
|
||||
elseif star > 5 and star < 10 then
|
||||
for i = 2, 24 do
|
||||
if i < star - 4 then
|
||||
if i - 1 <= star - 4 then
|
||||
starPre.transform:GetChild(i - 1):GetComponent("Image").sprite = spLoader:LoadSprite(GetHeroStarImage[2])
|
||||
starPre.transform:GetChild(i - 1):GetComponent("RectTransform").sizeDelta = starSize
|
||||
if rotation then
|
||||
|
@ -501,7 +501,7 @@ function SetHeroStars(spLoader, starGrid, star, type,_starSize,_scale,_pivot,rot
|
|||
elseif star > 9 then
|
||||
if type and type == 1 then
|
||||
for i = 2, 24 do
|
||||
if i == star - 3 then
|
||||
if i - 1 == star - 4 then
|
||||
starPre.transform:GetChild(i - 1).gameObject:SetActive(true)
|
||||
starPre.transform:GetChild(i - 1):GetComponent("RectTransform").sizeDelta = starSize
|
||||
else
|
||||
|
@ -519,7 +519,7 @@ function SetHeroStars(spLoader, starGrid, star, type,_starSize,_scale,_pivot,rot
|
|||
-- end
|
||||
else
|
||||
for i = 2, 24 do
|
||||
if i == star - 3 then
|
||||
if i - 1 == star - 4 then
|
||||
starPre.transform:GetChild(i - 1).gameObject:SetActive(true)
|
||||
starPre.transform:GetChild(i - 1):GetComponent("RectTransform").sizeDelta = starSize
|
||||
else
|
||||
|
|
Loading…
Reference in New Issue