森罗bug修复

dev_chengFeng
ZhangBiao 2020-07-28 16:45:28 +08:00
parent b4b24e62be
commit ddfbb25e2e
4 changed files with 5 additions and 76 deletions

View File

@ -1377,6 +1377,7 @@ HELP_TYPE = {
OpenHappy=50,-- 开服狂欢
OpenSevenDay=52,-- 开服狂欢
SoulPrintCommond=53,-- 魂印合成
Sunro=54,--森罗环境
EquipCompose=55,-- 装备合成
TreasureCompose=56,-- 宝物合成
TimeLimitedCall=57,-- 限时召唤

View File

@ -55,7 +55,6 @@ function this:InitComponent()
-- 试炼副本相关组件
this.leftUp = Util.GetGameObject(self.gameObject, "leftUp")
-- this.leftRelife = Util.GetGameObject(self.gameObject, "leftDown/leftLifeRoot")
this.centerDonwn = Util.GetGameObject(self.gameObject, "centerDown")
missionView.InitComponent(self.gameObject, this)
@ -93,16 +92,6 @@ function this:BindEvent()
Util.AddClick(this.btnAchive, function ()
UIManager.OpenPanel(UIName.EliteCarbonAchievePanel, MapManager.GetCurCarbonId(), false, 1)
end)
-- 背包
-- Util.AddClick(this.btnBag, function ()
-- UIManager.OpenPanel(UIName.MapBagPopup)
-- end)
--队伍
-- Util.AddClick(this.btnTeam, function ()
-- UIManager.OpenPanel(UIName.MapFormationInfoPopup)
-- end)
--排行
Util.AddClick(this.btnRank, function ()
UIManager.OpenPanel(UIName.CarbonScoreSortPanel,1)
@ -148,8 +137,6 @@ function this.SetEndlessShow()
end)
end)
else
-- UIManager.OpenPanel(UIName.MapLeavePanel) --暂时不要了
-- UIManager.OpenPanel(UIName.MapStatsPanel,true)--不需要确认退出了
Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out, 1, 0)
end
end
@ -216,12 +203,7 @@ function this:OnOpen(...)
EndLessMapManager.EndLessRoleDead = true
-- 永久隐藏设置按钮
ctrlView.Init()
-- 如果不是无尽副本,默认跳过战斗
--if CarbonManager.difficulty == CARBON_TYPE.ENDLESS then
-- CarbonManager.isPassFight = EndLessMapManager.isSkipFight == 1
--else
CarbonManager.isPassFight = true
--end
CarbonManager.isPassFight = true
-- 在这设置所有副本的初始化设置
-- 根据副本类型显示
@ -289,7 +271,6 @@ function this.InitCarbonSet()
--如果是在序章
local isStartMap = MapManager.curMapId == 100
-- this.BtnBack:SetActive(not isStartMap)
this.BtnBack2:SetActive(not isStartMap)
end
@ -297,7 +278,6 @@ end
-- 根据副本的类型显示组件
function this.InitCompShow(type)
this.leftUp:SetActive(type == 2)
-- this.leftRelife:SetActive(type == 2)
this.centerDonwn:SetActive(true)
end
@ -351,7 +331,6 @@ function this.OnMapDataChange(refreshType)
-- 增加地图移动速度
elseif refreshType == 2 then
-- 增加视野范围
--fogSize = FoodBuffManager.fogSize
local u, v = Map_Pos2UV(MapManager.curPos)
TileMapView.UpdateWarFog(u, v, MapManager.fogSize)
@ -565,9 +544,6 @@ function this.BackToCarbonPanel()
end
end
SwitchPanel.OpenPanel(UIName.MainPanel)
-- SwitchPanel.OpenPanel(panelNeedOpen[CarbonManager.difficulty], function()
-- UIManager.ClosePanel(UIName.MapPanel)
-- end)
end
-- 刷新红点
@ -739,12 +715,6 @@ function this.OnDeadCount(startTime, lastPos)
ctrlView.SetCtrlState(true)
-- 死亡次前端无奈的加一次
MapManager.deadCount = MapManager.deadCount + 1
-- if CarbonManager.difficulty == 2 then
-- trialPanel.OnRoleDead()
-- if MapTrialManager.GetRelifeTimes() - MapManager.deadCount < 0 then -- 次数用完出图
-- return
-- end
-- end
-- 清空血条值
playerView.InitRoleHp(false)
playerView.SetBattleState(false)
@ -769,8 +739,6 @@ end
function this.StopWalking()
ctrlView.OnRoleDead()
-- 换层时路径不一定完了,不弹完会卡死
--ctrlView.CallListPop()
end
function this.CallListPop()

View File

@ -94,7 +94,7 @@ function TrialMapPanel:BindEvent()
--帮助按钮
Util.AddClick(this.helpBtn,function()
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.Resolve_Recall,this.helpPos.x,this.helpPos.y)
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.Sunro,this.helpPos.x,this.helpPos.y)
end)
--设置按钮
Util.AddClick(MapPanel.btnSetting, function ()
@ -127,7 +127,7 @@ end
--界面打开时调用(用于子类重写)
function TrialMapPanel:OnOpen()
this.powerRoot:SetActive(CarbonManager.difficulty == 2)
this.btnBomb:SetActive(CarbonManager.difficulty == 2)
this.btnBomb:SetActive(false)--CarbonManager.difficulty == 2)
-- 商店
this.buffShop:SetActive(CarbonManager.difficulty == CARBON_TYPE.TRIAL)
this.normalShop:SetActive(CarbonManager.difficulty == CARBON_TYPE.TRIAL)

View File

@ -37,9 +37,7 @@ function this.ParseMissionState(missions, isInit)
local missionItem = missions
Log(Language[11366].. missionItem.itemId)
--Log("进图初始化副本任务IDState "..missionItem.state)
Log(Language[11367]..missionItem.missionStep)
--Log("进图初始化副本任务ID完成时间" .. missionItem.time)
--Log("missionItem.isOpen ".. string.format("%s", missionItem.isOpen))
local id = missionItem.itemId -- 任务索引值
@ -295,7 +293,7 @@ end
local directFight = function(showType, eventId, showValues, options)
local monsterGroupId = options[1]
--遇到怪就停在原处
-- Game.GlobalEvent:DispatchEvent(GameEvent.Map.StopWalk)
Game.GlobalEvent:DispatchEvent(GameEvent.Map.StopWalk)
--获取自动战斗
local t=(PlayerPrefs.HasKey(PlayerManager.uid.."GeneralPopup_TrialSettingBtn"..1)
and PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_TrialSettingBtn"..1)==1) and 1 or 0
@ -303,25 +301,6 @@ local directFight = function(showType, eventId, showValues, options)
Game.GlobalEvent:DispatchEvent(GameEvent.Map.ShowEnemyInfo, monsterGroupId,eventId,showValues)
else--快速战斗
-- --如果英雄阵亡 无法选择其进行战斗
-- for i, v in ipairs(MapManager.trialHeroInfo) do
-- local num = #MapManager.trialHeroInfo
-- if v.heroHp<=0 then
-- num = num -1
-- if num == 0 then
-- PopupTipPanel.ShowTip("猎妖师全部死亡,无法进入战斗!")
-- Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd)
-- return
-- end
-- end
-- -- if MapTrialManager.selectHeroDid==v.heroId then
-- -- if v.heroHp<=0 then
-- -- PopupTipPanel.ShowTip(Language[11247])
-- -- Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd)
-- -- return
-- -- end
-- -- end
-- end
--先保存编队
local curFormation = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_DREAMLAND)
local choosedList={}
@ -334,8 +313,6 @@ local directFight = function(showType, eventId, showValues, options)
MapTrialManager.SetHeroHp(msg.remainHpList,MapTrialManager.selectHeroDid)
CarbonManager.InitQuickFightData(monsterGroupId, eventId, msg)
--更新精气值
-- LogGreen("战斗后的更新精气值:"..msg.essenceValue)
-- MapTrialManager.UpdatePowerValue(msg.essenceValue)--这句话会调用之后的event导致召唤boss特效播放两次直接把精气值付上就好了
MapTrialManager.powerValue = msg.essenceValue
-- --召唤Boss
if CarbonManager.difficulty == CARBON_TYPE.TRIAL and MapTrialManager.powerValue >= 100 then
@ -411,9 +388,6 @@ local trailBuffPanel = function(showType, eventId, showValues, options)
Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd)
Game.GlobalEvent:DispatchEvent(GameEvent.Map.ProgressChange, 1, options[1])
end)
-- if not UIManager.IsOpen(UIName.BuffOptionPanel) then
-- UIManager.OpenPanel(UIName.BuffOptionPanel, eventId)
-- end
end
-- 无尽商店
@ -481,9 +455,6 @@ local funcList2={
[7]=function() --踩宝箱只发0
NetManager.GetTrialBoxRewardRequest(0,function(msg)
Game.GlobalEvent:DispatchEvent(GameEvent.Map.PointRemove, MapManager.curTriggerPos)--删除宝箱点
-- UIManager.OpenPanel(UIName.RewardItemPopup,msg.boxDrop,1,function()
-- Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd)
-- end)
local data = TrialMiniGameManager.IdToNameIconNum(msg.boxDrop.itemlist[1].itemId,msg.boxDrop.itemlist[1].itemNum)
PopupTipPanel.ShowColorTip(data[1],data[2],data[3])
Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd)
@ -511,7 +482,6 @@ local funcList2={
--地图点触发
function this.MapPointTrigger(style)
local i=0
-- Game.GlobalEvent:DispatchEvent(GameEvent.Map.StopWalk)
for k, v in pairs(MapManager.mapPointList) do
if MapPointConfig[v] and MapPointConfig[v].Style==style then
i =style
@ -520,7 +490,6 @@ function this.MapPointTrigger(style)
LogPink(i)
if funcList2[i] then
funcList2[i]()
-- Game.GlobalEvent:DispatchEvent(GameEvent.Guide.EventTriggered, eventId)
end
end
@ -532,10 +501,6 @@ function this.GetAllRewardTrigger()
and PlayerPrefs.GetInt(var)==1) and 1 or 0
if t==0 then return end
NetManager.GetTrialBoxRewardRequest(t,function(msg)
-- UIManager.OpenPanel(UIName.RewardItemPopup,msg.boxDrop,1,function()
-- Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd)
-- end)
Timer.New(function ()
for key, value in pairs(MapManager.mapPointList) do
-- LogPink("["..key.."] "..value)
@ -546,11 +511,6 @@ function this.GetAllRewardTrigger()
Game.GlobalEvent:DispatchEvent(GameEvent.Map.PointRemove,key)--删除所有的buff点
end
end
-- local data = TrialMiniGameManager.IdToNameIconNum(msg.boxDrop.itemlist[1].itemId,msg.boxDrop.itemlist[1].itemNum)
-- PopupTipPanel.ShowColorTip(data[1],data[2],data[3])
-- UIManager.OpenPanel(UIName.RewardItemPopup,msg.boxDrop,1)
local thread=coroutine.start(function()
--宝箱奖励掉落
for i = 1, #msg.boxDrop.itemlist do