Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
gaoxin 2021-11-16 16:31:24 +08:00
commit 63fedf2d3c
1 changed files with 4 additions and 1 deletions

View File

@ -102,7 +102,7 @@ function this.SingleBoxDataShow(go,boxData,index)
local TimerText = Util.GetGameObject(go.transform,"Box/Empty/frame/Text"):GetComponent("Text") local TimerText = Util.GetGameObject(go.transform,"Box/Empty/frame/Text"):GetComponent("Text")
local AddImage = Util.GetGameObject(go.transform,"Box/Empty/frame/AddImage") local AddImage = Util.GetGameObject(go.transform,"Box/Empty/frame/AddImage")
local redPoint = Util.GetGameObject(go.transform,"Box/Empty/redPoint") local redPoint = Util.GetGameObject(go.transform,"Box/Empty/redPoint")
local heroObj = Util.GetGameObject(go.transform,"GameObject")
Util.GetGameObject(go.transform, "GameObject/proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite("r_hero_huo 1_zh") Util.GetGameObject(go.transform, "GameObject/proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite("r_hero_huo 1_zh")
ItemList[go] ={} ItemList[go] ={}
ItemList[go].index = index ItemList[go].index = index
@ -110,6 +110,7 @@ function this.SingleBoxDataShow(go,boxData,index)
ItemList[go].Empty = Empty ItemList[go].Empty = Empty
ItemList[go].AddImage = AddImage ItemList[go].AddImage = AddImage
heroObj:SetActive(false)
Empty:SetActive(true) Empty:SetActive(true)
mask:SetActive(true) mask:SetActive(true)
lock:SetActive(true) lock:SetActive(true)
@ -121,6 +122,7 @@ function this.SingleBoxDataShow(go,boxData,index)
if gridData.gridId <= Box then if gridData.gridId <= Box then
if gridData.heroId ~= "" then if gridData.heroId ~= "" then
Empty:SetActive(false) Empty:SetActive(false)
heroObj:SetActive(true)
local data = HeroManager.GetSingleHeroData(gridData.heroId) local data = HeroManager.GetSingleHeroData(gridData.heroId)
if data then if data then
this.SingleItemDataShow(go, data) this.SingleItemDataShow(go, data)
@ -135,6 +137,7 @@ function this.SingleBoxDataShow(go,boxData,index)
AddImage:SetActive(false) AddImage:SetActive(false)
end end
Empty:SetActive(true) Empty:SetActive(true)
heroObj:SetActive(false)
mask:SetActive(false) mask:SetActive(false)
lock:SetActive(false) lock:SetActive(false)
redPoint:SetActive(false) redPoint:SetActive(false)