Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道

dev_chengFeng
wangzhenxing 2021-09-09 15:44:33 +08:00
commit 49a7a2b242
3 changed files with 10 additions and 6 deletions

View File

@ -1476,6 +1476,7 @@ FUNCTION_OPEN_TYPE = {
guajigongneng = 89,--挂机多人
FIGHTLEVEL = 107,--山河社稷图
PRACTICE = 108,--修行
JumpServer_YuXu = 111, -- 玉虚论道
}
@ -2452,7 +2453,7 @@ rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04_zh", name = Languag
[24] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_DEATHPOS_GUILD,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 24},
[25] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_DEATHPOS_ALLPERSON,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 25},
[26] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_DEATHPOS_ALLGUILD,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 26},
[27] = { bgImage = "", name = Language[12101] ,rankType = RANK_TYPE.WORLDARENA,activiteId = 0,isRankingMainPanelShow = 2,RankingListMainSortId = 10},
[27] = { bgImage = "", name = Language[12101] ,rankType = RANK_TYPE.WORLDARENA,activiteId = 0,isRankingMainPanelShow = 3,RankingListMainSortId = 10},
}

View File

@ -87,15 +87,18 @@ function this.SwitchView(index)
proud = RankingManager.GetRankProud()
--先执行上一面板关闭逻辑
local currankKingList = {}
local _GoIndex = #rankKingListGo + 1
for i = 1, math.max(#rankKingListGo, #rankKingList) do
if curIndex == rankKingList[i].isRankingMainPanelShow then
local go = rankKingListGo[i]
local go = rankKingListGo[_GoIndex]
if not go then
go=newObject(this.ItemPre)
go.transform:SetParent(this.grid.transform)
go.transform.localScale = Vector3.one
go.transform.localPosition=Vector3.zero;
rankKingListGo[i] = go
--LogPink("i "..i)
rankKingListGo[_GoIndex] = go
_GoIndex = _GoIndex + 1
end
go.gameObject:SetActive(false)
table.insert(currankKingList, rankKingList[i])
@ -105,7 +108,7 @@ function this.SwitchView(index)
if curIndex == rankKingList[i].isRankingMainPanelShow then
for j = 1, #currankKingList do
if currankKingList[j].rankType == rankKingList[i].rankType then
LogYellow("j "..j)
--LogYellow("j "..j)
rankKingListGo[j]:SetActive(true)
this.SingleRankKingListShow(j,i)
end

View File

@ -139,11 +139,11 @@ function WorldArenaMainPanel:BindEvent()
end)
--商店按钮
Util.AddClick(this.StoreBtn, function()
if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.ARENA) then
if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.JumpServer_YuXu) then
PopupTipPanel.ShowTip(Language[10075])
return
end
JumpManager.GoJump(20010)
JumpManager.GoJump(40032)
end)