无尽提交
parent
b197244667
commit
da6437e2a2
|
@ -2027,6 +2027,8 @@ GENERAL_POPUP_TYPE={
|
||||||
RecrutDetail = 36, --限时招募奖励详情
|
RecrutDetail = 36, --限时招募奖励详情
|
||||||
WuJinShuXing = 37,
|
WuJinShuXing = 37,
|
||||||
XiuXingSelectHero = 38,--修行选择英雄弹窗
|
XiuXingSelectHero = 38,--修行选择英雄弹窗
|
||||||
|
|
||||||
|
WuJinSetting = 39,
|
||||||
}
|
}
|
||||||
|
|
||||||
--通用信息弹窗类型
|
--通用信息弹窗类型
|
||||||
|
|
|
@ -681,10 +681,13 @@ function this.SetRewardData()
|
||||||
if v.Id == allMissionData[j].missionId then
|
if v.Id == allMissionData[j].missionId then
|
||||||
v.progress = allMissionData[j].progress
|
v.progress = allMissionData[j].progress
|
||||||
if allMissionData[j].state == 2 then
|
if allMissionData[j].state == 2 then
|
||||||
|
-- goText.text="已领取"
|
||||||
v.state = 0
|
v.state = 0
|
||||||
elseif allMissionData[j].state == 1 then
|
elseif allMissionData[j].state == 1 then
|
||||||
|
-- goText.text="领取"
|
||||||
v.state = allMissionData[j].state
|
v.state = allMissionData[j].state
|
||||||
elseif allMissionData[j].state == 0 then
|
elseif allMissionData[j].state == 0 then
|
||||||
|
-- goText.text="前往"
|
||||||
v.state = 2
|
v.state = 2
|
||||||
end
|
end
|
||||||
v.info = v.Desc ..("(")..v.progress.."/"..v.value..(")")
|
v.info = v.Desc ..("(")..v.progress.."/"..v.value..(")")
|
||||||
|
|
|
@ -143,6 +143,18 @@ function this:BindEvent()
|
||||||
end,1)
|
end,1)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
--帮助按钮
|
||||||
|
Util.AddClick(this.btnSetting,function()
|
||||||
|
if ctrlView.GetCallListCount() > 1 then
|
||||||
|
PopupTipPanel.ShowTip(Language[11259])
|
||||||
|
return
|
||||||
|
end
|
||||||
|
if CarbonManager.carbonType == CARBON_TYPE.TRIAL then
|
||||||
|
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.TrialSetting)
|
||||||
|
else
|
||||||
|
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.WuJinSetting)
|
||||||
|
end
|
||||||
|
end)
|
||||||
--missionView.BindEvent()
|
--missionView.BindEvent()
|
||||||
trialPanel:BindEvent()
|
trialPanel:BindEvent()
|
||||||
endLessMapView:BindEvent()
|
endLessMapView:BindEvent()
|
||||||
|
|
|
@ -59,7 +59,7 @@ function this:BindEvent()
|
||||||
-- CarbonManager.InitQuickFightData(monsterGroupId, nil, msg)
|
-- CarbonManager.InitQuickFightData(monsterGroupId, nil, msg)
|
||||||
|
|
||||||
local fightData = BattleManager.GetBattleServerData(msg)
|
local fightData = BattleManager.GetBattleServerData(msg)
|
||||||
UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.DAILY_CHALLENGE, function()
|
UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.MAP_FIGHT, function()
|
||||||
--更新精气值
|
--更新精气值
|
||||||
--LogGreen("战斗后的更新精气值:"..msg.essenceValue)
|
--LogGreen("战斗后的更新精气值:"..msg.essenceValue)
|
||||||
MapTrialManager.powerValue = msg.essenceValue
|
MapTrialManager.powerValue = msg.essenceValue
|
||||||
|
@ -74,10 +74,10 @@ function this:BindEvent()
|
||||||
-- 刷新数据
|
-- 刷新数据
|
||||||
CarbonManager.InitQuickFightData(monsterGroupId, nil, msg)
|
CarbonManager.InitQuickFightData(monsterGroupId, nil, msg)
|
||||||
end, 0.2):Start()
|
end, 0.2):Start()
|
||||||
if msg.result == 1 then
|
-- if msg.result == 1 then
|
||||||
UIManager.OpenPanel(UIName.RewardItemPopup,msg.enventDrop,1,function()
|
-- UIManager.OpenPanel(UIName.RewardItemPopup,msg.enventDrop,1,function()
|
||||||
end)
|
-- end)
|
||||||
end
|
-- end
|
||||||
end)
|
end)
|
||||||
self:ClosePanel()
|
self:ClosePanel()
|
||||||
end)
|
end)
|
||||||
|
@ -118,9 +118,7 @@ function this:BindEvent()
|
||||||
end)
|
end)
|
||||||
self:ClosePanel()
|
self:ClosePanel()
|
||||||
end)
|
end)
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -128,14 +128,6 @@ function TrialMapPanel:BindEvent()
|
||||||
end
|
end
|
||||||
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.Sunro,this.helpPos.x,this.helpPos.y)
|
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.Sunro,this.helpPos.x,this.helpPos.y)
|
||||||
end)
|
end)
|
||||||
--设置按钮
|
|
||||||
Util.AddClick(MapPanel.btnSetting, function ()
|
|
||||||
if ctrlView.GetCallListCount() > 1 then
|
|
||||||
PopupTipPanel.ShowTip(Language[11259])
|
|
||||||
return
|
|
||||||
end
|
|
||||||
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.TrialSetting)
|
|
||||||
end)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
--添加事件监听(用于子类重写)
|
--添加事件监听(用于子类重写)
|
||||||
|
|
|
@ -381,16 +381,19 @@ function EndLessMapView:ShowHeroData()
|
||||||
end
|
end
|
||||||
|
|
||||||
function EndLessMapView:RefreshTargetRoote()
|
function EndLessMapView:RefreshTargetRoote()
|
||||||
|
-- 0 "已领取"
|
||||||
|
-- 1 "领取"
|
||||||
|
-- 2 "前往"
|
||||||
this.curMission = EndLessMapManager.GetRewardData()
|
this.curMission = EndLessMapManager.GetRewardData()
|
||||||
LogGreen(this.curMission.state.." this.curMission.state")
|
LogGreen(this.curMission.state.." this.curMission.state")
|
||||||
if this.curMission.state == 0 then
|
if this.curMission.state == 2 then
|
||||||
this.TargetBtn1.gameObject:SetActive(false)
|
this.TargetBtn1.gameObject:SetActive(true) --未完成
|
||||||
this.TargetBtn2.gameObject:SetActive(true)
|
this.TargetBtn2.gameObject:SetActive(false) --以达成
|
||||||
this.TargetRootText.text = string.format("%s<color=#55c688>(%s/%s)</color>",this.curMission.Desc,this.curMission.progress,this.curMission.value)
|
this.TargetRootText.text = string.format("%s<color=#55c688>(%s/%s)</color>",this.curMission.Desc,this.curMission.progress,this.curMission.value)
|
||||||
else
|
else
|
||||||
this.TargetBtn1.gameObject:SetActive(true)
|
this.TargetBtn1.gameObject:SetActive(false)
|
||||||
this.TargetBtn2.gameObject:SetActive(false)
|
this.TargetBtn2.gameObject:SetActive(true)
|
||||||
if this.curMission.index == #EndLessMapManager.mission and this.curMission.state == 2 then
|
if this.curMission.index == #EndLessMapManager.mission and this.curMission.state == 0 then
|
||||||
this.TargetRootText.text = "已完成全部任务"
|
this.TargetRootText.text = "已完成全部任务"
|
||||||
else
|
else
|
||||||
this.TargetRootText.text = string.format("%s<color=#FFFFFF>(%s/%s)</color>",this.curMission.Desc,this.curMission.value,this.curMission.value)
|
this.TargetRootText.text = string.format("%s<color=#FFFFFF>(%s/%s)</color>",this.curMission.Desc,this.curMission.value,this.curMission.value)
|
||||||
|
|
|
@ -67,6 +67,7 @@ local contentScripts = {
|
||||||
[32] = {view = require("Modules/Popup/View/GeneralPopup_YunYouMan"), panelName = "GeneralPopup_YunYouMan",type=GENERAL_POPUP_TYPE.YunYouMan},
|
[32] = {view = require("Modules/Popup/View/GeneralPopup_YunYouMan"), panelName = "GeneralPopup_YunYouMan",type=GENERAL_POPUP_TYPE.YunYouMan},
|
||||||
--招募奖励详情
|
--招募奖励详情
|
||||||
[33] = {view = require("Modules/Popup/View/GeneralPopup_RecruitReward"), panelName = "GeneralPopup_RecruitReward",type=GENERAL_POPUP_TYPE.RecrutReward},
|
[33] = {view = require("Modules/Popup/View/GeneralPopup_RecruitReward"), panelName = "GeneralPopup_RecruitReward",type=GENERAL_POPUP_TYPE.RecrutReward},
|
||||||
|
[34] = {view = require("Modules/Popup/View/GeneralPopup_EndlessPanel"), panelName = "GeneralPopup_EndlessPanel",type=GENERAL_POPUP_TYPE.WuJinSetting},
|
||||||
}
|
}
|
||||||
--子模块预设
|
--子模块预设
|
||||||
local contentPrefabs={}
|
local contentPrefabs={}
|
||||||
|
|
Loading…
Reference in New Issue