Merge branch 'master_xma_local' into master_xma_test

dev_chengFeng hotfix/xma/test/0.1.59
JieLing 2020-12-29 15:57:39 +08:00
commit 650de3dc74
4 changed files with 30 additions and 24 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 923 KiB

After

Width:  |  Height:  |  Size: 920 KiB

View File

@ -60,8 +60,7 @@ function EndLessCarbonPanel:BindEvent()
CallBackOnPanelOpen(UIName.CarbonTypePanelV2, function()
UIManager.ClosePanel(UIName.EndLessCarbonPanel)
end)
CarbonManager.difficulty = 0
end)
Util.AddClick(this.btnFight, function ()

View File

@ -500,27 +500,18 @@ end
function this.OnMapOut(outType)
--出图不需要发协议了
Log("outType ====== " .. outType)
-- Log("outType ====== " .. outType)
-- 无尽副本需要传目的地的地图ID
-- local distMapId = 0
-- if CarbonManager.difficulty == CARBON_TYPE.ENDLESS and nextMapId > 0 then
-- distMapId = nextMapId
-- end
-- NetManager.MapOutRequest(outType, function (msg)
if outType == 0 then
this.BackHome()
MapManager.Mapping = false
-- elseif outType == 1 then -- 正常出图
-- this.BackToCarbonPanel()
-- MapManager.Mapping = false
else --换层或者换地图
this.ChangeMapByType()
end
Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd)
-- end, distMapId)
if outType == 0 then
CarbonManager.difficulty = 0
this.BackHome()
MapManager.Mapping = false
else --换层或者换地图
-- 音效
SoundManager.PlaySound(SoundConfig.Sound_xyc)
this.ChangeMapByType()
end
Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd)
end
-- ========================= 死出图的各种方法 ==========================
@ -535,7 +526,7 @@ function this.BackHome()
this.Dispose()
Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnClose, triggerCallBack)
end
BagManager.InBagGetMapBag()
-- BagManager.InBagGetMapBag()
end
Game.GlobalEvent:AddEvent(GameEvent.UI.OnClose, triggerCallBack)
-- 清空一下副本任务

View File

@ -59,7 +59,10 @@ end
--绑定事件(用于子类重写)
function SingleRecruitPanel:BindEvent()
Util.AddClick(self.sureBtn, function()
isFirst=true
isFirst=true
if lotterySetting[type].LotteryType == 11 then
isFirst=false
end
self:ClosePanel()
if PlayerManager.IsGetFiveStarHero then--and OperatingManager.IsShowFiveStarPatch then
Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceSend, FacePanelType.GrowGift, 5)
@ -102,6 +105,9 @@ function SingleRecruitPanel:BindEvent()
--十连跳过按钮 直接打开十连抽展示界面
Util.AddClick(self.jumpBtn, function()
isFirst=true
if lotterySetting[type].LotteryType == 11 then
isFirst=false
end
self:ClosePanel()
UIManager.OpenPanel(UIName.TenRecruitPanel,heroData,type)
end)
@ -115,6 +121,9 @@ function SingleRecruitPanel:BindEvent()
elseif state==2 then
if index>=LengthOfTable(_heroTable) then
isFirst=true
if lotterySetting[type].LotteryType == 11 then
isFirst=false
end
self:ClosePanel()
UIManager.OpenPanel(UIName.TenRecruitPanel,heroData,type)
else
@ -155,12 +164,19 @@ function SingleRecruitPanel:OnOpen(...)
state=data[3]
end
function SingleRecruitPanel:OnShow()
isFirst=true
maxTimesId=lotterySetting[type].MaxTimes --特权上限ID
index=0
if state==1 then --单抽
if lotterySetting[type].LotteryType == 11 then
isFirst=false
end
self:TenOpenPanel()
elseif state==2 then
isFirst=true
if lotterySetting[type].LotteryType == 11 then
isFirst=false
end
_heroTable={}
--将符合条件的英雄插入容器中
for k, v in ipairs(heroData) do