Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

jiaoyangna 2020-10-16 12:00:21 +08:00
commit 398e7f070b
3 changed files with 38 additions and 50 deletions

View File

@ -492,33 +492,33 @@ function this.GetMapBagItemCountById(_itemId)
return 0
end
--把地图临时背包物品数量加成到背包中
function this.InBagGetMapBag()
--for i, v in pairs(this.mapShotTimeItemData) do
-- if v.isSave then
-- if v.isSave == 1 then
-- this.UpdateBagData(v)
-- end
-- end
--end
for i, v in pairs(EquipManager.mapShotTimeItemData) do
EquipManager.UpdateEquipData(v)
end
for i, v in pairs(HeroManager.mapShotTimeItemData) do
HeroManager.UpdateHeroDatas(v)
end
for i, v in pairs(TalismanManager.mapShotTimeItemData) do
TalismanManager.InitUpdateSingleTalismanData(v)
end
-- function this.InBagGetMapBag()
-- --for i, v in pairs(this.mapShotTimeItemData) do
-- -- if v.isSave then
-- -- if v.isSave == 1 then
-- -- this.UpdateBagData(v)
-- -- end
-- -- end
-- --end
-- for i, v in pairs(EquipManager.mapShotTimeItemData) do
-- EquipManager.UpdateEquipData(v)
-- end
-- for i, v in pairs(HeroManager.mapShotTimeItemData) do
-- HeroManager.UpdateHeroDatas(v)
-- end
-- for i, v in pairs(TalismanManager.mapShotTimeItemData) do
-- TalismanManager.InitUpdateSingleTalismanData(v)
-- end
--SoulPrintManager.InitServerData(SoulPrintManager.mapShotTimeItemData)
EquipTreasureManager.InitAllEquipTreasure(SoulPrintManager.mapShotTimeItemData)
this.mapShotTimeItemData = {}
EquipManager.mapShotTimeItemData = {}
HeroManager.mapShotTimeItemData = {}
TalismanManager.mapShotTimeItemData = {}
SoulPrintManager.mapShotTimeItemData = {}
Game.GlobalEvent:DispatchEvent(GameEvent.Bag.BagGold)
end
-- --SoulPrintManager.InitServerData(SoulPrintManager.mapShotTimeItemData)
-- EquipTreasureManager.InitAllEquipTreasure(SoulPrintManager.mapShotTimeItemData)
-- this.mapShotTimeItemData = {}
-- EquipManager.mapShotTimeItemData = {}
-- HeroManager.mapShotTimeItemData = {}
-- TalismanManager.mapShotTimeItemData = {}
-- SoulPrintManager.mapShotTimeItemData = {}
-- Game.GlobalEvent:DispatchEvent(GameEvent.Bag.BagGold)
-- end
function this.OnShowTipDropNumZero(drop)
local addMaxNumItemNameList = ""
if drop.itemlist ~= nil and #drop.itemlist > 0 then

View File

@ -419,7 +419,7 @@ function this.BtnClick(id)
PopupTipPanel.ShowTip(string.format(Language[12297],config.OpenRules[2]))
end
elseif id == FUNCTION_OPEN_TYPE.ENDLESS then
if ActTimeCtrlManager.IsQualifiled(id) then
if ActTimeCtrlManager.SingleFuncState(id) then
MapManager.curCarbonType = CarBonTypeId.ENDLESS
MapManager.SetViewSize(3)--设置视野范围(明雷形式)
UIManager.OpenPanel(UIName.EndLessCarbonPanel)

View File

@ -488,29 +488,17 @@ 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 --换层或者换地图
-- 音效
SoundManager.PlaySound(SoundConfig.Sound_xyc)
this.ChangeMapByType()
end
Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd)
-- end, distMapId)
if outType == 0 then
this.BackHome()
MapManager.Mapping = false
else --换层或者换地图
-- 音效
SoundManager.PlaySound(SoundConfig.Sound_xyc)
this.ChangeMapByType()
end
Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd)
end
-- ========================= 死出图的各种方法 ==========================
@ -525,7 +513,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)
-- 清空一下副本任务