四海历练
parent
f227916ce0
commit
0ccaffd591
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -37,7 +37,7 @@ function FourElementMonsterCampPanel:InitComponent()
|
|||
local rootHight = this.grid.transform.rect.height
|
||||
local width = this.grid.transform.rect.width
|
||||
this.scrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView,this.grid.transform,
|
||||
this.pre, nil, Vector2.New(width, rootHight), 1, 2, Vector2.New(230, 0))
|
||||
this.pre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0, 0))
|
||||
this.scrollView.moveTween.MomentumAmount = 1
|
||||
this.scrollView.moveTween.Strength = 2
|
||||
|
||||
|
|
|
@ -36,7 +36,7 @@ function MonsterCampNewPanel:InitComponent()
|
|||
local rootHight = this.grid.transform.rect.height
|
||||
local width = this.grid.transform.rect.width
|
||||
this.scrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView,this.grid.transform,
|
||||
this.pre, nil, Vector2.New(width, rootHight), 1, 2, Vector2.New(230, 0))
|
||||
this.pre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0, 0))
|
||||
this.scrollView.moveTween.MomentumAmount = 1
|
||||
this.scrollView.moveTween.Strength = 2
|
||||
|
||||
|
|
|
@ -7720,7 +7720,7 @@ function NetManager.TrainingUnlockSkillRequest(_heroid,_unlockId,pockemensId,mag
|
|||
if pockemensId then
|
||||
|
||||
for i = 1, #pockemensId do
|
||||
data.pokemonIds:append(tostring(pockemensId[i]))
|
||||
data.pokemonIds:append((pockemensId[i]))
|
||||
end
|
||||
|
||||
|
||||
|
|
|
@ -325,8 +325,45 @@ function SpecailTrainingInfoPopup:SetSingleData(index,_go,_data)
|
|||
local magicSoldierIds={}
|
||||
magicSoldierIds[1]=""
|
||||
NetManager.TrainingUnlockSkillRequest( self._curHerodata.dynamicId,tData.Id,pokemenons,nil,TrainingUnlockSkillHeroItem,item,function (msg)
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop, 1)
|
||||
end)
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop, 1)
|
||||
if #TrainingUnlockSkillHeroItem>0 then
|
||||
local t={}
|
||||
for i=1 ,#TrainingUnlockSkillHeroItem do
|
||||
t[i]=TrainingUnlockSkillHeroItem[i].id
|
||||
end
|
||||
HeroManager.DeleteHeroDatas(t)
|
||||
end
|
||||
|
||||
if pokemenons and #pokemenons>0 then
|
||||
PokemonManager.RemovePokemonData(pokemenons)
|
||||
end
|
||||
if self.OpenType==1 then
|
||||
if CheckListIsContainValue1(self._curHerodata.HeroTraining.unlockIds,tData.Id) then
|
||||
Chose:SetActive(false)
|
||||
tip2:SetActive(true)
|
||||
else
|
||||
Chose:SetActive(true)
|
||||
tip2:SetActive(false)
|
||||
end
|
||||
else
|
||||
if CheckListIsContainValue1(self._curHerodata.HeroTraining.unlockIds,tData.Id) then
|
||||
Chose:SetActive(false)
|
||||
tip2:SetActive(true)
|
||||
localContent:SetActive(true)
|
||||
skillBtn:SetActive(true)
|
||||
else
|
||||
Chose:SetActive(true)
|
||||
tip2:SetActive(false)
|
||||
localContent:SetActive(false)
|
||||
skillBtn:SetActive(false)
|
||||
end
|
||||
end
|
||||
self.ScrollView:SetData(self.showList, function(index, go)
|
||||
self:SetSingleData(index,go,self.showList[index])
|
||||
end)
|
||||
ForceRebuildLayout(_go.transform)
|
||||
ForceRebuildLayout(self.GameObject.transform)
|
||||
end)
|
||||
end
|
||||
end
|
||||
)
|
||||
|
|
|
@ -27,18 +27,18 @@ function FourElementSingleWave:InitComponent(go,_data,_curType)
|
|||
self.fightBtnMask = Util.GetGameObject(self.fight,"mask"):GetComponent("Image")
|
||||
self.bg = Util.GetGameObject(go,"bg"):GetComponent("Image")
|
||||
self.rewardGrid = Util.GetGameObject(self.reward,"grid")
|
||||
-- self.frame=Util.GetGameObject(self.hero,"Bg1"):GetComponent("Image")
|
||||
--self.icon=Util.GetGameObject(self.hero, "Mask/icon"):GetComponent("RawImage")
|
||||
--self.icon=Util.GetGameObject(self.hero, "Mask/icon"):GetComponent("Image")
|
||||
-- self.lv = Util.GetGameObject(self.hero, "lv/Text"):GetComponent("Text")
|
||||
-- self.pro = Util.GetGameObject(self.hero, "Pro/Image"):GetComponent("Image")
|
||||
-- self.fg = Util.GetGameObject(self.hero,"Bg2"):GetComponent("Image")
|
||||
-- --self.starGrid = Util.GetGameObject(self.hero,"starGrid")
|
||||
-- self.starGrid = Util.GetGameObject(self.hero,"StarGrid")
|
||||
-- self.name=Util.GetGameObject(self.hero,"Name/Text"):GetComponent("Text")
|
||||
-- Util.GetGameObject(self.hero,"yuanImage"):SetActive(false)
|
||||
-- Util.GetGameObject(self.hero,"hpProgress"):SetActive(false)
|
||||
-- Util.GetGameObject(self.hero,"rageProgress"):SetActive(false)
|
||||
self.frame=Util.GetGameObject(self.hero,"Bg1"):GetComponent("Image")
|
||||
self.icon=Util.GetGameObject(self.hero, "Mask/icon"):GetComponent("RawImage")
|
||||
|
||||
self.lv = Util.GetGameObject(self.hero, "lv/Text"):GetComponent("Text")
|
||||
self.pro = Util.GetGameObject(self.hero, "Pro/Image"):GetComponent("Image")
|
||||
self.fg = Util.GetGameObject(self.hero,"Bg2"):GetComponent("Image")
|
||||
--self.starGrid = Util.GetGameObject(self.hero,"starGrid")
|
||||
self.starGrid = Util.GetGameObject(self.hero,"StarGrid")
|
||||
self.name=Util.GetGameObject(self.hero,"Name/Text"):GetComponent("Text")
|
||||
Util.GetGameObject(self.hero,"yuanImage"):SetActive(false)
|
||||
Util.GetGameObject(self.hero,"hpProgress"):SetActive(false)
|
||||
Util.GetGameObject(self.hero,"rageProgress"):SetActive(false)
|
||||
self.btn=Util.GetGameObject(go,"bg/btn")
|
||||
self.data = _data
|
||||
self.trailData = MonsterCampManager.GetCurFourElementMonsterInfo(_curType)
|
||||
|
@ -156,20 +156,20 @@ end
|
|||
|
||||
--设置每条英雄数据
|
||||
function FourElementSingleWave:SingleHeroDataShow(monConfig,heroData)
|
||||
-- self.frame.sprite=self.spLoader:LoadSprite(GetHeroCardStarBg[monConfig.Star])
|
||||
-- local liveName = heroData.live
|
||||
-- local roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, heroData.heroConfig.Id)
|
||||
-- local scale = roleConfig.play_liveScale
|
||||
-- local livePos = Vector3.New(roleConfig.offset[1], roleConfig.offset[2], 0)
|
||||
-- self.icon.texture = CardRendererManager.GetSpineTexture((self.data.wave%6 == 0 and 12 or (self.data.wave%6 + 6)), liveName, Vector3.one * scale, livePos, true)
|
||||
-- self.icon.transform.localScale = Vector3.one
|
||||
-- self.icon.transform.localPosition = Vector3.zero
|
||||
-- self.lv.text = monConfig.Level
|
||||
-- self.pro.sprite= self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.property))
|
||||
-- --self.icon.sprite = self.spLoader:LoadSprite(heroData.painting)
|
||||
-- SetCardStars(self.starGrid,monConfig.Star)
|
||||
-- self.fg.sprite = self.spLoader:LoadSprite(GetHeroCardStarFg[monConfig.Star])
|
||||
-- self.name.text = heroData.name
|
||||
-- self.frame.sprite=self.spLoader:LoadSprite(GetHeroCardStarBg[monConfig.Star])
|
||||
local liveName = heroData.painting
|
||||
local roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, heroData.heroConfig.Id)
|
||||
local scale = roleConfig.play_liveScale
|
||||
local livePos = Vector3.New(roleConfig.offset[1], roleConfig.offset[2]+60, 0)
|
||||
self.icon.texture = CardRendererManager.GetSpineTexture((self.data.wave%6 == 0 and 12 or (self.data.wave%6 + 6)), liveName, Vector3.one * scale, livePos, true)
|
||||
self.icon.transform.localScale = Vector3.one
|
||||
self.icon.transform.localPosition = Vector3.zero
|
||||
self.lv.text = monConfig.Level
|
||||
self.pro.sprite= self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.property))
|
||||
--self.icon.sprite = self.spLoader:LoadSprite(heroData.painting)
|
||||
SetCardStars(self.starGrid,monConfig.Star)
|
||||
self.fg.sprite = self.spLoader:LoadSprite(GetHeroCardStarFg[monConfig.Star])
|
||||
self.name.text = heroData.name
|
||||
end
|
||||
|
||||
function FourElementSingleWave:UpdatePrivilage()
|
||||
|
|
|
@ -15,19 +15,19 @@ function MonsterCampSingleWave:InitComponent(go,_data)
|
|||
self.Id = Util.GetGameObject(go,"bg/leftLayout/num"):GetComponent("Text")
|
||||
self.power = Util.GetGameObject(go,"bg/power/Text"):GetComponent("Text")
|
||||
|
||||
-- self.hero = Util.GetGameObject(go,"bg/Hero")
|
||||
-- self.frame=Util.GetGameObject(self.hero,"Bg1"):GetComponent("Image")
|
||||
-- self.icon=Util.GetGameObject(self.hero, "Mask/icon"):GetComponent("RawImage")
|
||||
-- self.lv = Util.GetGameObject(self.hero, "lv/Text"):GetComponent("Text")
|
||||
-- self.pro = Util.GetGameObject(self.hero, "Pro/Image"):GetComponent("Image")
|
||||
-- self.fg = Util.GetGameObject(self.hero,"Bg2"):GetComponent("Image")
|
||||
-- self.starGrid = Util.GetGameObject(self.hero,"StarGrid")
|
||||
-- self.name=Util.GetGameObject(self.hero,"Name/Text"):GetComponent("Text")
|
||||
-- self.effect = Util.GetGameObject(self.hero,"UI_Effect_jinkuang_KaPai")
|
||||
-- self.pass = Util.GetGameObject(self.hero,"pass")
|
||||
-- Util.GetGameObject(self.hero,"yuanImage"):SetActive(false)
|
||||
-- Util.GetGameObject(self.hero,"hpProgress"):SetActive(false)
|
||||
-- Util.GetGameObject(self.hero,"rageProgress"):SetActive(false)
|
||||
self.hero = Util.GetGameObject(go,"bg/Hero")
|
||||
self.frame=Util.GetGameObject(self.hero,"Bg1"):GetComponent("Image")
|
||||
self.icon=Util.GetGameObject(self.hero, "Mask/icon"):GetComponent("RawImage")
|
||||
self.lv = Util.GetGameObject(self.hero, "lv/Text"):GetComponent("Text")
|
||||
self.pro = Util.GetGameObject(self.hero, "Pro/Image"):GetComponent("Image")
|
||||
self.fg = Util.GetGameObject(self.hero,"Bg2"):GetComponent("Image")
|
||||
self.starGrid = Util.GetGameObject(self.hero,"StarGrid")
|
||||
self.name=Util.GetGameObject(self.hero,"Name/Text"):GetComponent("Text")
|
||||
self.effect = Util.GetGameObject(self.hero,"UI_Effect_jinkuang_KaPai")
|
||||
self.pass = Util.GetGameObject(self.hero,"pass")
|
||||
Util.GetGameObject(self.hero,"yuanImage"):SetActive(false)
|
||||
Util.GetGameObject(self.hero,"hpProgress"):SetActive(false)
|
||||
Util.GetGameObject(self.hero,"rageProgress"):SetActive(false)
|
||||
|
||||
|
||||
self.reward = Util.GetGameObject(go,"bg/rewardRect")
|
||||
|
@ -164,19 +164,19 @@ end
|
|||
|
||||
--设置每条英雄数据
|
||||
function MonsterCampSingleWave:SingleHeroDataShow(monConfig,heroData)
|
||||
-- self.frame.sprite=self.spLoader:LoadSprite(GetHeroCardStarBg[monConfig.Star])
|
||||
-- local liveName = GetResourcePath(heroData.Live)
|
||||
-- local roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, heroData.Id)
|
||||
-- local scale = roleConfig.play_liveScale
|
||||
-- local livePos = Vector3.New(roleConfig.offset[1], roleConfig.offset[2], 0)
|
||||
-- self.icon.texture = CardRendererManager.GetSpineTexture((self.data.Id%6 == 0 and 12 or (self.data.Id%6) + 6), liveName, Vector3.one * scale, livePos, true)
|
||||
-- self.icon.transform.localScale = Vector3.one
|
||||
-- self.icon.transform.localPosition = Vector3.zero
|
||||
-- self.lv.text = monConfig.Level
|
||||
-- self.pro.sprite= self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.PropertyName))
|
||||
-- SetCardStars(self.starGrid,monConfig.Star)
|
||||
-- self.fg.sprite = self.spLoader:LoadSprite(GetHeroCardStarFg[monConfig.Star])
|
||||
-- self.name.text = heroData.ReadingName
|
||||
--self.frame.sprite=self.spLoader:LoadSprite(GetHeroCardStarBg[monConfig.Star])
|
||||
local liveName = GetResourcePath(heroData.Painting)
|
||||
local roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, heroData.Id)
|
||||
local scale = roleConfig.play_liveScale
|
||||
local livePos = Vector3.New(roleConfig.offset[1], roleConfig.offset[2]+60, 0)
|
||||
self.icon.texture = CardRendererManager.GetSpineTexture((self.data.Id%6 == 0 and 12 or (self.data.Id%6) + 6), liveName, Vector3.one * scale, livePos, true)
|
||||
self.icon.transform.localScale = Vector3.one
|
||||
self.icon.transform.localPosition = Vector3.zero
|
||||
self.lv.text = monConfig.Level
|
||||
self.pro.sprite= self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.PropertyName))
|
||||
SetCardStars(self.starGrid,monConfig.Star)
|
||||
self.fg.sprite = self.spLoader:LoadSprite(GetHeroCardStarFg[monConfig.Star])
|
||||
self.name.text = heroData.ReadingName
|
||||
end
|
||||
|
||||
function MonsterCampSingleWave:UpdatePrivilage()
|
||||
|
|
Loading…
Reference in New Issue