Merge branch '0功能/1月6_版本优化' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1月6_版本优化
commit
fa46595132
|
|
@ -60,8 +60,7 @@ function EndLessCarbonPanel:BindEvent()
|
||||||
CallBackOnPanelOpen(UIName.CarbonTypePanelV2, function()
|
CallBackOnPanelOpen(UIName.CarbonTypePanelV2, function()
|
||||||
UIManager.ClosePanel(UIName.EndLessCarbonPanel)
|
UIManager.ClosePanel(UIName.EndLessCarbonPanel)
|
||||||
end)
|
end)
|
||||||
|
CarbonManager.difficulty = 0
|
||||||
|
|
||||||
end)
|
end)
|
||||||
|
|
||||||
Util.AddClick(this.btnFight, function ()
|
Util.AddClick(this.btnFight, function ()
|
||||||
|
|
|
||||||
|
|
@ -471,6 +471,7 @@ function this.OnMapOut(outType)
|
||||||
--出图不需要发协议了
|
--出图不需要发协议了
|
||||||
Log("outType ====== " .. outType)
|
Log("outType ====== " .. outType)
|
||||||
if outType == 0 then
|
if outType == 0 then
|
||||||
|
CarbonManager.difficulty = 0
|
||||||
this.BackHome()
|
this.BackHome()
|
||||||
MapManager.Mapping = false
|
MapManager.Mapping = false
|
||||||
else --换层或者换地图
|
else --换层或者换地图
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue