diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua index 44df2aa4b5..c7ef08a9d7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua @@ -26,7 +26,7 @@ end function this.UpdateBagData(_itemData, isNoSendNewItemEvent) isNoSendNewItemEvent = isNoSendNewItemEvent or false local itemdata = {} - --Log("_itemData.itemId -=-=-=-=-=-=-=-=-=-=-=-=-=-=- ".._itemData.itemId.." ".._itemData.itemNum) + --LogGreen("_itemData.itemId -=-=-=-=-=-=-=-=-=-=-=-=-=-=- ".._itemData.itemId.." ".._itemData.itemNum) local _itemCfgData = itemConfig[_itemData.itemId] if _itemCfgData ~= nil then -- 宝器数据不能通过背包,这里判断如果是宝器则舍弃这个数据, diff --git a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua index 19226443f3..a0150e0beb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua @@ -666,9 +666,6 @@ function this.InitMissionData() for i = 1,#v.Reward do table.insert(data.BoxReward ,v.Reward[i]) end - for i = 1,#v.MazePoint do - table.insert(data.BoxReward ,v.MazePoint[i]) - end data.state = 0 table.insert(this.mission,data) end diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/OptionBehaviourManager.lua b/Assets/ManagedResources/~Lua/Modules/Mission/OptionBehaviourManager.lua index a614c6fb35..6dcd3dec9e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/OptionBehaviourManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/OptionBehaviourManager.lua @@ -295,6 +295,15 @@ function this.UpdateEventPoint(msg, optionId, func) NetManager.RequestAllHeroHp(function () Game.GlobalEvent:DispatchEvent(GameEvent.EndLess.RefreshHeroData) end) + elseif behaviorType == 54 then -- 战斗并销毁指定地图点 + behaviorNodeList = { + {"Battle", {monsterID = beArgs[1][1]}, this.SetNextEventId}, + {"MapProgressChange", {type = 2, curEventID = 0, monsterID = beArgs[1][1]}}, + {"DeletePoint", {pointID = {beArgs[1][2]}}}, + } + NetManager.RequestAllHeroHp(function () + Game.GlobalEvent:DispatchEvent(GameEvent.EndLess.RefreshHeroData) + end) end -- 没有行为 @@ -328,7 +337,6 @@ function this.JumpEventPoint(eventId, optionId, panel, func) this.CurTriggerPanel = panel if jumpType == 4 then --关闭界面,不读取,不刷新事件点 - -- 试炼副本的最后一层 if MapTrialManager.IsFinalLevel() then Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua index 15ab3ff7dd..147d3430cd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/AutoRecoverManager.lua @@ -43,7 +43,7 @@ local _TimeCheckFunc = { end local nextFreshTime = itemData.nextFlushTime local remationTime = nextFreshTime - PlayerManager.serverTime - LogGreen("remationTime:"..remationTime) + --LogGreen("remationTime:"..remationTime) if remationTime > 0 then return remationTime end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua index d309a56853..23f17c3b12 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua @@ -45,24 +45,26 @@ function BattleWinPopup:NextStep() return end if m_fightType == BATTLE_TYPE.MAP_FIGHT then --副本战斗结算 + -- m_battlePanel:ClosePanel() + -- self:ClosePanel() --UIManager.OpenPanel(UIName.RewardItemPopup, m_battleResult.drop, 1,function() m_battlePanel:ClosePanel() self:ClosePanel() end, 1, true) - -- local bestData, allDamage= BattleRecordManager.GetBattleBestData() - -- FightPointPassManager.oldLevel = PlayerManager.level - -- if bestData then - -- UIManager.OpenPanel(UIName.BattleBestPopup, bestData.roleId, bestData.damage, allDamage, function(_BattleBestPopup) - -- -- 打开关卡奖励界面 - -- UIManager.OpenPanel(UIName.RewardItemPopup, m_battleResult.drop, 1,function() - -- if _BattleBestPopup then - -- _BattleBestPopup:ClosePanel() - -- end - -- if m_battlePanel then - -- m_battlePanel:ClosePanel() - -- end - -- self:ClosePanel() - -- Game.GlobalEvent:DispatchEvent(GameEvent.Bag.BagGold) - -- end, 1, true, true) - -- end) - -- end + local bestData, allDamage= BattleRecordManager.GetBattleBestData() + FightPointPassManager.oldLevel = PlayerManager.level + if bestData then + UIManager.OpenPanel(UIName.BattleBestPopup, bestData.roleId, bestData.skinId,bestData.damage, allDamage, function(_BattleBestPopup) + -- 打开关卡奖励界面 + UIManager.OpenPanel(UIName.RewardItemPopup, m_battlePanel.drop, 1,function() + if _BattleBestPopup then + _BattleBestPopup:ClosePanel() + end + if m_battlePanel then + m_battlePanel:ClosePanel() + end + self:ClosePanel() + Game.GlobalEvent:DispatchEvent(GameEvent.Bag.BagGold) + end, 1, true, true) + end) + end -- end) elseif m_fightType == BATTLE_TYPE.ELITE_MONSTER then --限时怪战斗结算