Merge branch '0功能/1月6_版本优化' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1月6_版本优化

dev_chengFeng
jiaoyangna 2020-12-29 10:35:35 +08:00
commit fa46595132
2 changed files with 2 additions and 2 deletions

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

@ -471,6 +471,7 @@ function this.OnMapOut(outType)
--出图不需要发协议了
Log("outType ====== " .. outType)
if outType == 0 then
CarbonManager.difficulty = 0
this.BackHome()
MapManager.Mapping = false
else --换层或者换地图