parent
85b5e8fad0
commit
d6f2808d5b
|
|
@ -565,6 +565,7 @@ function SkillCaster:CheckFullSceenSkill(combat, skill,skillduration)
|
||||||
elseif combat.EffectType == 5 then
|
elseif combat.EffectType == 5 then
|
||||||
local offset = combat.Offset and Vector3.New(combat.Offset[1], combat.Offset[2], 0) or Vector3.zero
|
local offset = combat.Offset and Vector3.New(combat.Offset[1], combat.Offset[2], 0) or Vector3.zero
|
||||||
local sortingOrder = self.effectRoot:GetComponent("Canvas").sortingOrder
|
local sortingOrder = self.effectRoot:GetComponent("Canvas").sortingOrder
|
||||||
|
LogError("全屏特效屏幕中心"..tostring(combat.Id))
|
||||||
local go2 = BattleManager.LoadAsset(combat.Bullet, sortingOrder)
|
local go2 = BattleManager.LoadAsset(combat.Bullet, sortingOrder)
|
||||||
go2.transform:SetParent(self.effectRoot.transform)
|
go2.transform:SetParent(self.effectRoot.transform)
|
||||||
-- 检测特效旋转
|
-- 检测特效旋转
|
||||||
|
|
|
||||||
|
|
@ -93,6 +93,7 @@ function this:InitComponent()
|
||||||
for i = 1, 6 do
|
for i = 1, 6 do
|
||||||
bgListGo[i]=Util.GetGameObject(this.gameObject,"RoleGrid/Bg"..i)
|
bgListGo[i]=Util.GetGameObject(this.gameObject,"RoleGrid/Bg"..i)
|
||||||
heroListGo[i] = Util.GetGameObject(this.gameObject,"RoleGrid/Bg"..i.."/Hero"..i)
|
heroListGo[i] = Util.GetGameObject(this.gameObject,"RoleGrid/Bg"..i.."/Hero"..i)
|
||||||
|
Util.GetGameObject(heroListGo[i],"lv"):SetActive(false)
|
||||||
maskListGo[i]=Util.GetGameObject(this.gameObject,"RoleGrid/Mask"..i)
|
maskListGo[i]=Util.GetGameObject(this.gameObject,"RoleGrid/Mask"..i)
|
||||||
if not dragViewListGo[i] then
|
if not dragViewListGo[i] then
|
||||||
dragViewListGo[i] = SubUIManager.Open(SubUIConfig.DragView, bgListGo[i].transform)
|
dragViewListGo[i] = SubUIManager.Open(SubUIConfig.DragView, bgListGo[i].transform)
|
||||||
|
|
@ -127,9 +128,9 @@ function this:InitComponent()
|
||||||
tabs[i] = Util.GetGameObject(this.gameObject, "Grid/Tabs/Btn" .. i)
|
tabs[i] = Util.GetGameObject(this.gameObject, "Grid/Tabs/Btn" .. i)
|
||||||
Util.GetGameObject(tabs[i], "Text"):GetComponent("Text"):GetComponent("Text").text=PropertyType[i]
|
Util.GetGameObject(tabs[i], "Text"):GetComponent("Text"):GetComponent("Text").text=PropertyType[i]
|
||||||
tabs[i]:SetActive(true)
|
tabs[i]:SetActive(true)
|
||||||
-- if tabsImg[i + 1] then
|
if tabsImg[i + 1] then
|
||||||
-- tabs[i]:GetComponent("Image").sprite = this.spLoader:LoadSprite(tabsImg[i + 1])
|
tabs[i]:GetComponent("Image").sprite = this.spLoader:LoadSprite(tabsImg[i + 1])
|
||||||
-- end
|
end
|
||||||
end
|
end
|
||||||
this.selectBtn = Util.GetGameObject(this.gameObject, "Grid/selectBtn")
|
this.selectBtn = Util.GetGameObject(this.gameObject, "Grid/selectBtn")
|
||||||
this.selectTxt=Util.GetGameObject(this.gameObject, "Grid/selectBtn/Text"):GetComponent("Text")
|
this.selectTxt=Util.GetGameObject(this.gameObject, "Grid/selectBtn/Text"):GetComponent("Text")
|
||||||
|
|
@ -186,20 +187,18 @@ function this:InitComponent()
|
||||||
|
|
||||||
this.jumpFightBtn=Util.GetGameObject(self.transform, "jumpFight/btn")
|
this.jumpFightBtn=Util.GetGameObject(self.transform, "jumpFight/btn")
|
||||||
this.jumpFightGou=Util.GetGameObject(self.transform, "jumpFight/Image")
|
this.jumpFightGou=Util.GetGameObject(self.transform, "jumpFight/Image")
|
||||||
--[[
|
this.ProListObj=Util.GetGameObject(self.gameObject, "Grid")
|
||||||
this.ProListObj=Util.GetGameObject(self.gameObject, "selectBar")
|
this.selectObj=Util.GetGameObject(self.gameObject, "Grid/selectBtn")
|
||||||
this.selectObj=Util.GetGameObject(self.gameObject, "selectBar/selectBtn")
|
|
||||||
this.signBtnList={}
|
this.signBtnList={}
|
||||||
for i=1,4 do
|
for i=1,4 do
|
||||||
local proObj={}
|
local proObj={}
|
||||||
local btn=Util.GetGameObject(self.gameObject, "selectBar/btn"..i)
|
local btn=Util.GetGameObject(self.gameObject, "Grid/Tabs/Btn"..i)
|
||||||
proObj.img=btn:GetComponent("Image")
|
proObj.img=btn:GetComponent("Image")
|
||||||
proObj.img.sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(i))
|
proObj.img.sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(i))
|
||||||
proObj.btn=btn
|
proObj.btn=btn
|
||||||
this.signBtnList[i]=proObj
|
this.signBtnList[i]=proObj
|
||||||
end
|
end
|
||||||
this.ProListObj:SetActive(false)
|
this.ProListObj:SetActive(false)
|
||||||
]]
|
|
||||||
end
|
end
|
||||||
|
|
||||||
function this:BindEvent()
|
function this:BindEvent()
|
||||||
|
|
@ -531,6 +530,7 @@ function this.SetCardSingleData(o, heroId, _pos, _heroData)
|
||||||
local bg=Util.GetGameObject(o,"Bg1"):GetComponent("Image")
|
local bg=Util.GetGameObject(o,"Bg1"):GetComponent("Image")
|
||||||
local icon=Util.GetGameObject(o,"Bg1/icon"):GetComponent("Image")
|
local icon=Util.GetGameObject(o,"Bg1/icon"):GetComponent("Image")
|
||||||
local lv=Util.GetGameObject(o,"lv/Text"):GetComponent("Text")
|
local lv=Util.GetGameObject(o,"lv/Text"):GetComponent("Text")
|
||||||
|
Util.GetGameObject(o,"lv"):SetActive(true)
|
||||||
local hp = Util.GetGameObject(o,"hpProgress/hp"):GetComponent("Image")
|
local hp = Util.GetGameObject(o,"hpProgress/hp"):GetComponent("Image")
|
||||||
local hpPass = Util.GetGameObject(o,"hpProgress/hpPass"):GetComponent("Image")
|
local hpPass = Util.GetGameObject(o,"hpProgress/hpPass"):GetComponent("Image")
|
||||||
local rage = Util.GetGameObject(o,"rageProgress/rage"):GetComponent("Image")
|
local rage = Util.GetGameObject(o,"rageProgress/rage"):GetComponent("Image")
|
||||||
|
|
@ -852,6 +852,7 @@ function this.SingleHeroDataShow(_go, _heroData)
|
||||||
local frame=Util.GetGameObject(go,"frame"):GetComponent("Image")
|
local frame=Util.GetGameObject(go,"frame"):GetComponent("Image")
|
||||||
local icon=Util.GetGameObject(go, "icon"):GetComponent("Image")
|
local icon=Util.GetGameObject(go, "icon"):GetComponent("Image")
|
||||||
local lv= Util.GetGameObject(go, "lv/Text"):GetComponent("Text")
|
local lv= Util.GetGameObject(go, "lv/Text"):GetComponent("Text")
|
||||||
|
Util.GetGameObject(go,"lv"):SetActive(true)
|
||||||
local pro= Util.GetGameObject(go, "proIcon"):GetComponent("Image")
|
local pro= Util.GetGameObject(go, "proIcon"):GetComponent("Image")
|
||||||
local pos= Util.GetGameObject(go, "posIcon"):GetComponent("Image")
|
local pos= Util.GetGameObject(go, "posIcon"):GetComponent("Image")
|
||||||
local teamList={}
|
local teamList={}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue