Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容

dev_chengFeng
jiaoyangna 2021-01-15 10:50:32 +08:00
commit 4ec81d52f4
6 changed files with 16 additions and 8 deletions

View File

@ -1520,6 +1520,7 @@ HELP_TYPE = {
YiJingBaoKu=77,--易经宝库
LingShouBaoGe=78,--灵兽宝阁
XinJiangLaiXi=81,--新将来袭
ArenaGuess = 84,--竞技场竞猜界面
XiangYaoDuoBao=85,--降妖夺宝
}

View File

@ -945,7 +945,7 @@ function this.GetIsBattleEndState(type)
return false
end
end
--屏幕索引 没啥用了
--有用,用来显示帮助内容
function this.SetCurTabIndex(index)
this.CurTabIndex = index
end

View File

@ -25,7 +25,11 @@ end
--绑定事件(用于子类重写)
function ATM_Title:BindEvent()
Util.AddClick(this.btnHelp, function ()
UIManager.OpenPanel(UIName.HelpPopup, HELP_TYPE.TopMatch, this.helpPosition.x, this.helpPosition.y)
if ArenaTopMatchManager.GetCurTabIndex() == 2 then
UIManager.OpenPanel(UIName.HelpPopup, HELP_TYPE.ArenaGuess, this.helpPosition.x, this.helpPosition.y)
else
UIManager.OpenPanel(UIName.HelpPopup, HELP_TYPE.TopMatch, this.helpPosition.x, this.helpPosition.y)
end
end)
end

View File

@ -181,7 +181,7 @@ end
function this:Refresh()
this.effect:SetActive(true)
this.effect2:SetActive(false)
this.shop:SetActive(false)
ActInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.Celebration)--活动数据
activityId = ActInfo.activityId
actReward = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",activityId)

View File

@ -267,15 +267,15 @@ function RewardItemSingleShowPopup:OnShow()
if jumpSortData[i].id > 0 then
if not RECHARGEABLE then--(是否开启充值)
if this.isRewardItemPop == true or itemConfigData.Id == 61 or itemConfigData.Id == 19 or itemConfigData.ItemType == 17 then
SubUIManager.Open(SubUIConfig.JumpView, this.equipProGrid.transform, jumpSortData[i].id,false)
SubUIManager.Open(SubUIConfig.JumpView, this.equipProGrid.transform, jumpSortData[i].id,false,self)
else
SubUIManager.Open(SubUIConfig.JumpView, this.equipProGrid.transform, jumpSortData[i].id,true)
SubUIManager.Open(SubUIConfig.JumpView, this.equipProGrid.transform, jumpSortData[i].id,true,self)
end
else
if this.isRewardItemPop == true or itemConfigData.ItemType == 17 then
SubUIManager.Open(SubUIConfig.JumpView, this.equipProGrid.transform, jumpSortData[i].id,false)
SubUIManager.Open(SubUIConfig.JumpView, this.equipProGrid.transform, jumpSortData[i].id,false,self)
else
SubUIManager.Open(SubUIConfig.JumpView, this.equipProGrid.transform, jumpSortData[i].id,true)
SubUIManager.Open(SubUIConfig.JumpView, this.equipProGrid.transform, jumpSortData[i].id,true,self)
end
end
end

View File

@ -32,13 +32,16 @@ end
--界面打开时调用(用于子类重写)
function JumpView:OnOpen(jumpId,isRewardItemPop)
function JumpView:OnOpen(jumpId,isRewardItemPop,parent)
self.jumpSData=JumpConfig[jumpId]
if self.jumpSData then
self.info.text=self.jumpSData.Title
self.btnSureText.text = Language[10509]
Util.AddOnceClick(self.btnSure, function()
self:GoToJumpData()
if parent then
parent:ClosePanel()
end
end)
end
if MapManager.Mapping or UIManager.IsOpen(UIName.BattlePanel) or isRewardItemPop == false then-- or BagManager.isBagPanel