parent
3246dc4c69
commit
a3d42ec9fb
|
@ -2942,9 +2942,9 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: -60, y: -60}
|
m_AnchoredPosition: {x: -60, y: -27.810028}
|
||||||
m_SizeDelta: {x: 117.880005, y: 32.190002}
|
m_SizeDelta: {x: 117.880005, y: 32.190002}
|
||||||
m_Pivot: {x: 0, y: 0}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!222 &7225143497615663008
|
--- !u!222 &7225143497615663008
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -3654,15 +3654,16 @@ end
|
||||||
--获取某一个星级的所有英雄
|
--获取某一个星级的所有英雄
|
||||||
function this.GetAllNumStarData(star)
|
function this.GetAllNumStarData(star)
|
||||||
local heros = {}
|
local heros = {}
|
||||||
local heros2 = {}
|
local heros2 = FormationManager.GetAllFormationHeroId()
|
||||||
for i, v in pairs(heroDatas) do
|
for i, v in pairs(heroDatas) do
|
||||||
if v.star==star then
|
if v.star==star and heros2[i]==nil then
|
||||||
table.insert(heros, v)
|
table.insert(heros, v)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
return heros
|
return heros
|
||||||
end
|
end
|
||||||
|
|
||||||
--单个英雄升级红点
|
--单个英雄升级红点
|
||||||
function this.LvUpBtnRedPoint(curHeroData)
|
function this.LvUpBtnRedPoint(curHeroData)
|
||||||
HeroManager.GetCurHeroUpLvOrUpStarSData(curHeroData)
|
HeroManager.GetCurHeroUpLvOrUpStarSData(curHeroData)
|
||||||
|
|
|
@ -117,7 +117,7 @@ function TrainingItemListPanel:OnOpen(_curData,_func,NeedNum,selectItems1,select
|
||||||
end
|
end
|
||||||
elseif _curData.type==3 then
|
elseif _curData.type==3 then
|
||||||
|
|
||||||
local pokemonList = PokemonManager.GetPokemonDatas()
|
local pokemonList = PokemonManager.GetCanUpZhenPokemonDatas()
|
||||||
local index=0
|
local index=0
|
||||||
for i=1,#pokemonList do
|
for i=1,#pokemonList do
|
||||||
local v={}
|
local v={}
|
||||||
|
@ -250,6 +250,7 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择
|
||||||
local lockImage = Util.GetGameObject(formationMask.transform, "lockImage")
|
local lockImage = Util.GetGameObject(formationMask.transform, "lockImage")
|
||||||
local noumenon = Util.GetGameObject(go, "noumenon")
|
local noumenon = Util.GetGameObject(go, "noumenon")
|
||||||
local starGrid = Util.GetGameObject(go.transform, "star")
|
local starGrid = Util.GetGameObject(go.transform, "star")
|
||||||
|
--starGrid.transform.position=Vector3.New(-60,-60,0)
|
||||||
local cardBtn = Util.GetGameObject(go.transform, "icon")
|
local cardBtn = Util.GetGameObject(go.transform, "icon")
|
||||||
local GongMingMask = Util.GetGameObject(go.transform, "GongMingMask")
|
local GongMingMask = Util.GetGameObject(go.transform, "GongMingMask")
|
||||||
if heroData.type == RoleUpStarMatType.hero then
|
if heroData.type == RoleUpStarMatType.hero then
|
||||||
|
@ -426,7 +427,7 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择
|
||||||
local lockImage = Util.GetGameObject(formationMask.transform, "lockImage")
|
local lockImage = Util.GetGameObject(formationMask.transform, "lockImage")
|
||||||
local noumenon = Util.GetGameObject(go, "noumenon")
|
local noumenon = Util.GetGameObject(go, "noumenon")
|
||||||
local starGrid = Util.GetGameObject(go.transform, "star")
|
local starGrid = Util.GetGameObject(go.transform, "star")
|
||||||
starGrid.transform.position=Vector3.New(-60,-60,0)
|
--starGrid.transform.position=Vector3.New(-60,-60,0)
|
||||||
local cardBtn = Util.GetGameObject(go.transform, "icon")
|
local cardBtn = Util.GetGameObject(go.transform, "icon")
|
||||||
local GongMingMask = Util.GetGameObject(go.transform, "GongMingMask")
|
local GongMingMask = Util.GetGameObject(go.transform, "GongMingMask")
|
||||||
frame.sprite = this.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.pokemonData.config.Quality,heroData.star))
|
frame.sprite = this.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.pokemonData.config.Quality,heroData.star))
|
||||||
|
|
Loading…
Reference in New Issue