dev_chengFeng
ZhangBiao 2020-07-28 17:25:50 +08:00
parent 99e1c1d52a
commit 6c316bf7de
5 changed files with 7 additions and 17 deletions

View File

@ -21474,7 +21474,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 55}
m_SizeDelta: {x: 800, y: 200} m_SizeDelta: {x: 800, y: 200}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &624669742079600518 --- !u!222 &624669742079600518

View File

@ -167,7 +167,7 @@ function QianKunBox:refreshBtnShow()
CheckRedPointStatus(RedPointType.QianKunBox) CheckRedPointStatus(RedPointType.QianKunBox)
end,freeTimesId) end,freeTimesId)
end end
if state==0 and d[1] ==16 then if state==0 and d[1] ==16 and not isFree then
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.QianKunBoxSingle,recruitOne) UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.QianKunBoxSingle,recruitOne)
else else
recruitOne() recruitOne()
@ -184,7 +184,7 @@ function QianKunBox:refreshBtnShow()
CheckRedPointStatus(RedPointType.QianKunBox) CheckRedPointStatus(RedPointType.QianKunBox)
end,freeTimesId) end,freeTimesId)
end end
if state==0 and d[1] ==16 then if state==0 and d[1] ==16 and not isFree then
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.QianKunBoxTen,recruitTen) UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.QianKunBoxTen,recruitTen)
else else
recruitTen() recruitTen()

View File

@ -291,7 +291,7 @@ function TimeLimitedCall:RefreshGetHeroTimes()
CheckRedPointStatus(RedPointType.TimeLimited) CheckRedPointStatus(RedPointType.TimeLimited)
end,freeTimesId) end,freeTimesId)
end end
if state==0 and d[1] ==16 then if state==0 and d[1] ==16 and not isFree then
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.TimeLimitSingle,recruitOne) UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.TimeLimitSingle,recruitOne)
else else
recruitOne() recruitOne()
@ -309,7 +309,7 @@ function TimeLimitedCall:RefreshGetHeroTimes()
CheckRedPointStatus(RedPointType.TimeLimited) CheckRedPointStatus(RedPointType.TimeLimited)
end,freeTimesId) end,freeTimesId)
end end
if state==0 and d[1] ==16 then if state==0 and d[1] ==16 and not isFree then
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.TimeLimitTen,recruitTen) UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.TimeLimitTen,recruitTen)
else else
recruitTen() recruitTen()

View File

@ -4,7 +4,6 @@ local this = {}
local parent local parent
--传入特效层级 --传入特效层级
local sortingOrder=0 local sortingOrder=0
local ctrlView = require("Modules/Map/View/MapControllView") local ctrlView = require("Modules/Map/View/MapControllView")
local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig) local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig)
local trialSetting=ConfigManager.GetConfig(ConfigName.TrialSetting) local trialSetting=ConfigManager.GetConfig(ConfigName.TrialSetting)
@ -14,14 +13,12 @@ local itemId=0 --消耗道具ID
local itemNum=0 --消耗道具数量 local itemNum=0 --消耗道具数量
local usedNum=0 --已使用的数量 local usedNum=0 --已使用的数量
function this:InitComponent(gameObject) function this:InitComponent(gameObject)
this.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text") this.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text")
this.body=Util.GetGameObject(gameObject,"Body") this.body=Util.GetGameObject(gameObject,"Body")
this.item=Util.GetGameObject(this.body,"Item") this.item=Util.GetGameObject(this.body,"Item")
this.leftTime=Util.GetGameObject(this.body,"leftTime"):GetComponent("Text") this.leftTime=Util.GetGameObject(this.body,"leftTime"):GetComponent("Text")
this.num=Util.GetGameObject(this.body,"Num"):GetComponent("Text") this.num=Util.GetGameObject(this.body,"Num"):GetComponent("Text")
-- this.root=Util.GetGameObject(gameObject,"Rot"):GetComponent("Text")
this.cancelBtn=Util.GetGameObject(gameObject,"CancelBtn") this.cancelBtn=Util.GetGameObject(gameObject,"CancelBtn")
this.confirmBtn=Util.GetGameObject(gameObject,"ConfirmBtn") this.confirmBtn=Util.GetGameObject(gameObject,"ConfirmBtn")
@ -40,11 +37,6 @@ function this:BindEvent()
PopupTipPanel.ShowTip(Language[11248]) PopupTipPanel.ShowTip(Language[11248])
return return
else else
-- UIManager.OpenPanel(UIName.TrialOpPanel, 2)
-- 停止自动寻路
-- ctrlView.OnRoleDead()
--tiralOPpanel里面
--向服务器请求使用炸弹 --向服务器请求使用炸弹
MapManager.MapUpdateEvent(-1000, function () MapManager.MapUpdateEvent(-1000, function ()
Log(Language[11270]) Log(Language[11270])
@ -54,7 +46,6 @@ function this:BindEvent()
-- 更新背包数量 -- 更新背包数量
BagManager.DeleteTempBagCountById(43, 1) BagManager.DeleteTempBagCountById(43, 1)
this.KillAllBitch() this.KillAllBitch()
local showDrop = function() local showDrop = function()
UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop, 2, function () UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop, 2, function ()
-- 回复精气值 -- 回复精气值
@ -103,7 +94,6 @@ function this:OnShow(_parent,...)
itemId=trialSetting[1].BombId[1][1] itemId=trialSetting[1].BombId[1][1]
itemNum= BagManager.GetItemCountById(itemId) itemNum= BagManager.GetItemCountById(itemId)
-- LogBlue(BagManager.GetItemCountById(itemId))
usedNum=MapTrialManager.bombUsed usedNum=MapTrialManager.bombUsed
this.RefreshPanel() this.RefreshPanel()
end end

View File

@ -208,7 +208,7 @@ function this.UpdatePanelData()
UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],m.type,bType.Btn1) UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],m.type,bType.Btn1)
end,v.privilegeId) end,v.privilegeId)
end end
if state==0 and d[1] ==16 then if state==0 and d[1] ==16 and not isFree then
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.Single,recruitOne) UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.Single,recruitOne)
else else
recruitOne() recruitOne()
@ -229,7 +229,7 @@ function this.UpdatePanelData()
end end
end,v.privilegeId) end,v.privilegeId)
end end
if state==0 and d[1] ==16 then if state==0 and d[1] ==16 and not isFree then
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.Ten,recruitTen) UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.Ten,recruitTen)
else else
recruitTen() recruitTen()