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

dev_chengFeng
jiaoyangna 2021-05-29 18:52:59 +08:00
commit ae03663c79
4 changed files with 34 additions and 12 deletions

View File

@ -1708,6 +1708,7 @@ FormationTypeDef = {
GUILD_TRANSCRIPT = 1501, --公会副本
FIGHT_LEVEL = 1701, --山河社稷图主关卡编队
FIGHT_ASSISTANTLEVEL = 1801, --山河社稷图副主关卡编队
FORMATION_TSLX = 1901, --踏碎凌霄编队 没有实际意义后端做特殊操作 其实就是主线编队
}
--编队需要拉取主线
@ -1731,6 +1732,7 @@ PLAYER_INFO_VIEW_TYPE = {
GO_TO_BLACK = 3,
ARENA = 4,
MIND_DEMON = 5,
TSLX = 6,--踏碎凌霄当前排行编队
}
--限时达人 周卡 限时活动 拍脸 异妖直购

View File

@ -36,6 +36,13 @@ local _ViewConfig = {
tip = Language[12306],
btnType = {
}
},
[PLAYER_INFO_VIEW_TYPE.TSLX] = {
formationType = FormationTypeDef.FORMATION_TSLX,
tip = "挑战阵容",
btnType = {
}
},
}
@ -279,16 +286,22 @@ function this.FormationAdapter(teamInfo)
SetHeroIcon(this.spLoader, hero,Util.GetGameObject(heroGo, "icon"):GetComponent("Image"),heroConfig)
local frameBtn = Util.GetGameObject(this.Demons[hero.position], "frame")
local heroData = {}
Util.AddOnceClick(frameBtn, function()
NetManager.ViewHeroInfoRequest(this._PlayerId,hero.heroid,function(msg)
if not hero.heroid then
return
end
heroData= GoodFriendManager.GetHeroDatas(msg.hero,msg.force,msg.SpecialEffects,msg.guildSkill)
GoodFriendManager.InitEquipData(msg.equip,heroData)--HeroManager.GetSingleHeroData(heroData.dynamicId)
UIManager.OpenPanel(UIName.RoleInfoPopup, heroData,true)
if this._Config.formationType == FormationTypeDef.FORMATION_TSLX then
Util.AddOnceClick(frameBtn, function()
UIManager.OpenPanel(UIName.RoleGetInfoPopup,false,demonId,hero.star)
end)
end)
else
Util.AddOnceClick(frameBtn, function()
NetManager.ViewHeroInfoRequest(this._PlayerId,hero.heroid,function(msg)
if not hero.heroid then
return
end
heroData= GoodFriendManager.GetHeroDatas(msg.hero,msg.force,msg.SpecialEffects,msg.guildSkill)
GoodFriendManager.InitEquipData(msg.equip,heroData)--HeroManager.GetSingleHeroData(heroData.dynamicId)
UIManager.OpenPanel(UIName.RoleInfoPopup, heroData,true)
end)
end)
end
end
end
local len=#teamInfo.PokemonInfos

View File

@ -286,7 +286,11 @@ function this.SetHeadsInfo(data,root,index,name,level)
npc:OnOpen(GetPlayerRoleSingleConFig().Scale6,Vector3.New(0,-118.65,0),WALK_DIR.IDLE_LEFT)
Util.AddOnceClick(this.firstheadClick,function()
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid)
if sData.rankType == RANK_TYPE.TASUILINGXIAO then
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.TSLX)
else
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid)
end
end)
end
@ -316,7 +320,11 @@ end
function this.AddPlayerInfoClick(root,uid)
local clickBtn=Util.GetGameObject(root,"ClickBtn")
Util.AddOnceClick(clickBtn,function()
UIManager.OpenPanel(UIName.PlayerInfoPopup, uid)
if sData.rankType == RANK_TYPE.TASUILINGXIAO then
UIManager.OpenPanel(UIName.PlayerInfoPopup, uid,PLAYER_INFO_VIEW_TYPE.TSLX)
else
UIManager.OpenPanel(UIName.PlayerInfoPopup, uid)
end
end)
end
--设置自身背景

View File

@ -13,7 +13,6 @@ function TaSuiLingXiao:InitComponent()
self.btnBack = Util.GetGameObject(self.gameObject, "btnBack")
self.btnHelp = Util.GetGameObject(self.gameObject, "btnHelp")
self.btnRank = Util.GetGameObject(self.gameObject, "btnRank")
self.btnRank:SetActive(false)
self.btnBox = Util.GetGameObject(self.gameObject, "progress/box")
self.mid = Util.GetGameObject(self.gameObject, "mid")
self.finishedText = Util.GetGameObject(self.mid, "FinishedText")