玉虚论道优化提交
parent
98d09ef527
commit
36d542ba9d
|
|
@ -6139,7 +6139,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: 396.8, y: 714.3}
|
||||
m_SizeDelta: {x: 98.19, y: 98.19}
|
||||
m_SizeDelta: {x: 104, y: 104}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8615198845383106814
|
||||
CanvasRenderer:
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1746,6 +1746,7 @@ HELP_TYPE = {
|
|||
AgeTip = 104,--适龄提示
|
||||
QiJieTreasure = 105,--七界秘宝
|
||||
QiJieShiLian = 106,--七界试炼
|
||||
YuXu = 107,--玉虚
|
||||
FourQuadrant=108,--四象心法
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ local switchFunc = function (type)
|
|||
end
|
||||
end
|
||||
this.ChangeTeamIndex(type)
|
||||
PopupTipPanel.ShowTip("已交换队伍顺序!")
|
||||
end
|
||||
|
||||
local isLeftOrRight=false
|
||||
|
|
|
|||
|
|
@ -25,9 +25,9 @@ local type = {
|
|||
sort = 3,
|
||||
bg = "r_Dungeon_rendi_01",
|
||||
name = "y_yuxulundao_yuxurukou_zh",
|
||||
live = "m_chsm_0035_png",
|
||||
livePos = Vector2(274.5, -408.1),
|
||||
liveSize = Vector2(1612, 1802),
|
||||
live = "lingjijuyuan",
|
||||
livePos = Vector2(149, 13),
|
||||
liveSize = Vector2(1024, 356),
|
||||
tipBg = "r_Dungeon_juqingdian",
|
||||
resetTime = string.format("<color=#A5ADD1>%s</color>",specialConfig[127].Value),
|
||||
tip = string.format("<color=#A5ADD1>%s</color>",specialConfig[127].Value),
|
||||
|
|
@ -167,8 +167,10 @@ function JumpServerPanel:BtnClick(id)
|
|||
end
|
||||
|
||||
if id == JumpServer_Type.YuXuLunDao then
|
||||
UIManager.OpenPanel(UIName.WorldArenaMainPanel)
|
||||
self:ClosePanel()
|
||||
NetManager.CrossYuXuLunDaoGetInfoRequest(function(msg)
|
||||
UIManager.OpenPanel(UIName.WorldArenaMainPanel,msg)
|
||||
self:ClosePanel()
|
||||
end)
|
||||
end
|
||||
if id == JumpServer_Type.QiJieShiLian then
|
||||
local qiejieConfig = ConfigManager.GetConfig(ConfigName.QijieStage)
|
||||
|
|
|
|||
|
|
@ -311,7 +311,9 @@ function this.SetHeadsInfo(data,root,index,name,level)
|
|||
elseif sData.rankType == RANK_TYPE.JUMPSERVER_FIGHTLEVEL_STAR or sData.rankType == RANK_TYPE.JUMPSERVER_FORCE_CURR_RANK or sData.rankType == RANK_TYPE.JUMPSERVER_GUILD_FORCE_RANK or sData.rankType == RANK_TYPE.JUMPSERVER_MONSTER_RANK then
|
||||
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.JUPMSERVER_NORMAL,data.serverName and data.serverName or nil)
|
||||
elseif sData.rankType == RANK_TYPE.WORLDARENA then--玉虚论道
|
||||
UIManager.OpenPanel(UIName.WorldArenaOtherTeamPanel, data.uid,2)
|
||||
NetManager.GetPlayerCrossYxldOneTeamInfoRequest(data.uid,0,function(msg)
|
||||
UIManager.OpenPanel(UIName.WorldArenaOtherTeamPanel,data.uid,2,msg)
|
||||
end)
|
||||
elseif sData.rankType == RANK_TYPE.QIJIESHILIAN_RANK then--七界试炼
|
||||
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.NORMAL,data.serverName and data.serverName or nil)
|
||||
else
|
||||
|
|
@ -354,7 +356,9 @@ function this.AddPlayerInfoClick(root,uid,serverName)
|
|||
elseif sData.rankType == RANK_TYPE.JUMPSERVER_FIGHTLEVEL_STAR or sData.rankType == RANK_TYPE.JUMPSERVER_FORCE_CURR_RANK or sData.rankType == RANK_TYPE.JUMPSERVER_GUILD_FORCE_RANK or sData.rankType == RANK_TYPE.JUMPSERVER_MONSTER_RANK then
|
||||
UIManager.OpenPanel(UIName.PlayerInfoPopup, uid,PLAYER_INFO_VIEW_TYPE.JUPMSERVER_NORMAL,serverName and serverName or nil)
|
||||
elseif sData.rankType == RANK_TYPE.WORLDARENA then
|
||||
UIManager.OpenPanel(UIName.WorldArenaOtherTeamPanel, uid,2)
|
||||
NetManager.GetPlayerCrossYxldOneTeamInfoRequest(uid,0,function(msg)
|
||||
UIManager.OpenPanel(UIName.WorldArenaOtherTeamPanel,uid,2,msg)
|
||||
end)
|
||||
elseif sData.rankType == RANK_TYPE.QIJIESHILIAN_RANK then--七界试炼
|
||||
UIManager.OpenPanel(UIName.PlayerInfoPopup, uid,PLAYER_INFO_VIEW_TYPE.NORMAL,serverName and serverName or nil)
|
||||
else
|
||||
|
|
|
|||
|
|
@ -376,6 +376,8 @@ function WorldArenaBattleInfoPanel:OnOpen(msg,_type,closeFunc,list)
|
|||
if list then
|
||||
state=3
|
||||
resultList=list
|
||||
else
|
||||
state=1
|
||||
end
|
||||
if state==1 then
|
||||
for i = 1, 3 do
|
||||
|
|
|
|||
|
|
@ -180,10 +180,9 @@ end
|
|||
local grid, rankData
|
||||
--界面打开时调用(用于子类重写)
|
||||
local oldScore
|
||||
function WorldArenaMainPanel:OnOpen(...)
|
||||
function WorldArenaMainPanel:OnOpen(msg)
|
||||
-- 参数保存
|
||||
local args = {...}
|
||||
NetManager.CrossYuXuLunDaoGetInfoRequest(function(msg)
|
||||
-- NetManager.CrossYuXuLunDaoGetInfoRequest(function(msg)
|
||||
local currRankId=msg.newLevelId
|
||||
LogError(" newMyscore=="..msg.newMyscore.." oldmyscore=="..msg.oldMyscore)
|
||||
grid, rankData=WorldArenaManager.GetRankImgByScore(msg.newMyscore)
|
||||
|
|
@ -201,7 +200,6 @@ function WorldArenaMainPanel:OnOpen(...)
|
|||
WorldArenaManager.SetNewScore(msg.newMyscore)
|
||||
WorldArenaManager.SetMyData(myRank,challengeTime)
|
||||
this.Integral.text="积分:"..msg.newMyscore
|
||||
LogError("self.sorlayer=="..self.sortingOrder)
|
||||
this.SetStarShow(grid,self.sortingOrder)
|
||||
this.endTime.text="周日23:30赛季结束"
|
||||
this:RefreshEnemyData(msg.arenaEnemys)
|
||||
|
|
@ -221,7 +219,7 @@ function WorldArenaMainPanel:OnOpen(...)
|
|||
if msg.isFirst then
|
||||
FormationManager.RefreshFormationData()
|
||||
end
|
||||
end)
|
||||
-- end)
|
||||
end
|
||||
|
||||
|
||||
|
|
@ -353,7 +351,9 @@ function this:RefreshEnemyData(team)
|
|||
table.insert(enemyList,EnemyList[i].uid)
|
||||
Util.AddOnceClick(bg, function()
|
||||
LogError("uid=="..EnemyList[i].uid)
|
||||
UIManager.OpenPanel(UIName.WorldArenaOtherTeamPanel, EnemyList[i].uid,1)
|
||||
NetManager.GetPlayerCrossYxldOneTeamInfoRequest(EnemyList[i].uid,0,function(msg)
|
||||
UIManager.OpenPanel(UIName.WorldArenaOtherTeamPanel, EnemyList[i].uid,1,msg)
|
||||
end)
|
||||
end)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ local itemId, needNum
|
|||
local haveNum=0
|
||||
local time=0
|
||||
local enemyId
|
||||
local curMsg=nil
|
||||
function WorldArenaOtherTeamPanel:InitComponent()
|
||||
self.spLoader = SpriteLoader.New()
|
||||
self.btnBack = Util.GetGameObject(self.gameObject, "Frame/other/BackBtn")
|
||||
|
|
@ -83,9 +84,10 @@ function WorldArenaOtherTeamPanel:RemoveListener()
|
|||
end
|
||||
|
||||
--界面打开时调用(用于子类重写)
|
||||
function WorldArenaOtherTeamPanel:OnOpen(_playerId,_type)
|
||||
function WorldArenaOtherTeamPanel:OnOpen(_playerId,_type,_msg)
|
||||
self.playerId = _playerId
|
||||
type=_type
|
||||
curMsg=_msg
|
||||
end
|
||||
|
||||
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
||||
|
|
@ -112,11 +114,11 @@ end
|
|||
|
||||
function WorldArenaOtherTeamPanel:Refresh()
|
||||
LogError("self.playerid=="..self.playerId)
|
||||
NetManager.GetPlayerCrossYxldOneTeamInfoRequest(self.playerId,0,function(msg)
|
||||
WorldArenaOtherTeamPanel:SetPlayerInfo(self.playerInfo,msg.teamInfo)
|
||||
WorldArenaOtherTeamPanel:SetTeamInfo(self.teamInfo,{msg.teamInfo.crossTeam[1],msg.teamInfo.crossTeam[2],msg.teamInfo.crossTeam[3]})
|
||||
WorldArenaOtherTeamPanel:SetPokemonInfo(self.pokemonInfo,msg.teamInfo.crossTeam[1].PokemonInfos)
|
||||
WorldArenaOtherTeamPanel:SetImprintInfo(self.imprintInfo,msg.teamInfo.crossTeam[1].sealShow)
|
||||
--NetManager.GetPlayerCrossYxldOneTeamInfoRequest(self.playerId,0,function(msg)
|
||||
WorldArenaOtherTeamPanel:SetPlayerInfo(self.playerInfo,curMsg.teamInfo)
|
||||
WorldArenaOtherTeamPanel:SetTeamInfo(self.teamInfo,{curMsg.teamInfo.crossTeam[1],curMsg.teamInfo.crossTeam[2],curMsg.teamInfo.crossTeam[3]})
|
||||
WorldArenaOtherTeamPanel:SetPokemonInfo(self.pokemonInfo,curMsg.teamInfo.crossTeam[1].PokemonInfos)
|
||||
WorldArenaOtherTeamPanel:SetImprintInfo(self.imprintInfo,curMsg.teamInfo.crossTeam[1].sealShow)
|
||||
if type==1 then
|
||||
self.btnChallenge:SetActive(true)
|
||||
else
|
||||
|
|
@ -125,7 +127,7 @@ function WorldArenaOtherTeamPanel:Refresh()
|
|||
|
||||
ForceRebuildLayout(self.content.transform)
|
||||
ForceRebuildLayout(self.Frame.transform)
|
||||
end)
|
||||
--end)
|
||||
end
|
||||
|
||||
--实在不想算了,直接写死吧,毁灭吧
|
||||
|
|
@ -190,7 +192,7 @@ function WorldArenaOtherTeamPanel:SetTeamInfo(_go,teamData)
|
|||
local title = Util.GetGameObject(go,"Title"):GetComponent("Text")
|
||||
local teamList = Util.GetGameObject(go,"TeamList")
|
||||
title.text = string.format( "第%s队",NumToChinese[index])
|
||||
self:SetImgPos(go,data.totalForce)
|
||||
--self:SetImgPos(go,data.totalForce)
|
||||
|
||||
for i, demon in ipairs(self.teamList[index].heroList) do
|
||||
Util.GetGameObject(demon, "frame"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(1))
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ function WorldArenaRankRewardPanel:InitComponent()
|
|||
this.tabbox = Util.GetGameObject(self.gameObject, "tabbox")
|
||||
this.btnBack = Util.GetGameObject(self.gameObject, "btnBack")
|
||||
this.Title = Util.GetGameObject(self.gameObject, "Title"):GetComponent("Text")
|
||||
this.Title.text="排行"
|
||||
this.tipText = Util.GetGameObject(self.gameObject, "content1/tipText"):GetComponent("Text")
|
||||
this.myRank = Util.GetGameObject(self.gameObject, "content1/myRank")
|
||||
this.myRankNum = Util.GetGameObject(self.gameObject, "content1/myRank/num"):GetComponent("Text")
|
||||
|
|
|
|||
Loading…
Reference in New Issue