【七界试炼】合并后提交
parent
fa85ecb870
commit
40fb962879
|
@ -10804,7 +10804,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: d1f4d20f8566d1a448cb49b4c9ec87a0, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 57ba83093fdb6584aa9b65bef822c58d, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
|
@ -2196,12 +2196,12 @@ GENERAL_POPUP_TYPE={
|
|||
JinJieYuLan = 42, --进阶预览
|
||||
WishDraw = 43, --心愿抽卡
|
||||
ChooseUpSoul = 44, --选择up魂印
|
||||
QiJieTreasure = 46, --七界试炼遗物
|
||||
FourElementReturnLook = 45,--四灵试炼回放界面
|
||||
ShenYingShuXing = 49,--神应属性
|
||||
FourElementHelpFight = 47,--四灵试炼助战
|
||||
FourElementReturnLook = 48,--四灵试炼回放界面
|
||||
XunBaoMiZong = 46, --寻宝迷踪奖励
|
||||
QiJieTreasure = 50, --七界试炼遗物
|
||||
}
|
||||
|
||||
--通用信息弹窗类型
|
||||
|
@ -2526,7 +2526,7 @@ rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04_zh", name = Languag
|
|||
[17] = { bgImage = "", name = "排行榜" ,rankType = RANK_TYPE.TASUILINGXIAO,activiteId = ActivityTypeDef.TaSuiLingXiao,isRankingMainPanelShow = 0,RankingListMainSortId = 20},
|
||||
--跨服(界面中)
|
||||
[18] = { bgImage = "", name = "罗浮争锋排行" ,rankType = RANK_TYPE.JUMPSERVER_HIGHTLADDER,activiteId = 0,isRankingMainPanelShow = 3,RankingListMainSortId = 21},--跨服排行版部分
|
||||
[28] = { bgImage = "", name = "七界试炼排行" ,rankType = RANK_TYPE.QIJIESHILIAN_RANK,activiteId = 0,isRankingMainPanelShow = 3,RankingListMainSortId = 0},--跨服排行版部分
|
||||
[32] = { bgImage = "", name = "七界试炼排行" ,rankType = RANK_TYPE.QIJIESHILIAN_RANK,activiteId = 0,isRankingMainPanelShow = 3,RankingListMainSortId = 0},--跨服排行版部分
|
||||
--排行榜按钮中跨服排行
|
||||
[19] = { bgImage = "r_zjm_paihangbang_banner002_zh", name = "排行榜" ,rankType = RANK_TYPE.JUMPSERVER_FORCE_CURR_RANK,activiteId = 0,isRankingMainPanelShow= 2,RankingListMainSortId = 5},
|
||||
[20] = { bgImage = "r_zjm_paihangbang_banner001_zh", name = "排行榜" ,rankType = RANK_TYPE.JUMPSERVER_MONSTER_RANK,activiteId = 0,isRankingMainPanelShow= 2,RankingListMainSortId = 6},
|
||||
|
|
|
@ -44,6 +44,10 @@ end
|
|||
function this.GetTreasureData(ActType)
|
||||
this.curType = ActType
|
||||
local actInfo = ActivityGiftManager.GetActivityTypeInfo(ActType)
|
||||
if not actInfo then
|
||||
PopupTipPanel.ShowTip("活动暂未开启。")
|
||||
return
|
||||
end
|
||||
local curTypeData = this.TreasureList[ActType]
|
||||
curTypeData.ActId = actInfo.activityId
|
||||
curTypeData.endTime = actInfo.endTime
|
||||
|
|
|
@ -298,6 +298,7 @@ function this.SwitchBtnCheck(num,func)
|
|||
if this.curLevelId + 1 > this.curMaxStage then
|
||||
return
|
||||
end
|
||||
LogRed(this.curMaxStage.." "..this.curLevelId.." "..tostring(this.IsLock))
|
||||
if this.curMaxStage == this.curLevelId + 1 then
|
||||
this.IsLock = false
|
||||
end
|
||||
|
|
|
@ -99,7 +99,7 @@ function QiJieShiLianPanel:BindEvent()
|
|||
UIManager.OpenPanel(UIName.GeneralRankRewardPanel,4,QiJieShiLianManager.curRank)--需要活动id,和我的排名
|
||||
end)
|
||||
Util.AddClick(self.sortBtn,function()
|
||||
UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[28])
|
||||
UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[32])
|
||||
end)
|
||||
Util.AddClick(self.shopBtn,function()
|
||||
JumpManager.GoJump(40035)
|
||||
|
|
Loading…
Reference in New Issue