add zhushi
parent
e2c5b69f38
commit
f7c842eb9a
|
@ -278,13 +278,15 @@ local noHandle = function(showType, eventId, showValues, options)
|
|||
Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd)
|
||||
end
|
||||
|
||||
-- 地图对话界面
|
||||
-- 前往下一层界面
|
||||
local mapDialoguePanel = function(showType, eventId, showValues, options)
|
||||
--旧界面是单独的界面
|
||||
-- if not UIManager.IsOpen(UIName.MapOptionPanel) then
|
||||
-- UIManager.OpenPanel(UIName.MapOptionPanel, showType, eventId, showValues, options)
|
||||
-- LogPink("MissionManager showType"..showType.." eventId"..eventId)
|
||||
-- end
|
||||
|
||||
--现已做成三级弹窗
|
||||
if not UIManager.IsOpen(UIName.GeneralPopup) then
|
||||
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.TrialToNextFloor, showType, eventId, showValues, options)
|
||||
end
|
||||
|
@ -300,14 +302,15 @@ end
|
|||
-- 直接战斗
|
||||
local directFight = function(showType, eventId, showValues, options)
|
||||
local monsterGroupId = options[1]
|
||||
|
||||
--遇到怪就停在原处
|
||||
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
|
||||
if t==0 then --CarbonManager.isPassFight
|
||||
if t==0 then --非快速战斗,打开二级弹窗
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Map.ShowEnemyInfo, monsterGroupId,eventId,showValues)
|
||||
else
|
||||
else--快速战斗
|
||||
--如果英雄阵亡 无法选择其进行战斗(这段已经没用了,每次战斗结束都会判断角色是否还活着)
|
||||
for i, v in ipairs(MapManager.trialHeroInfo) do
|
||||
if MapTrialManager.selectHeroDid==v.heroId then
|
||||
if v.heroHp<=0 then
|
||||
|
@ -317,6 +320,7 @@ local directFight = function(showType, eventId, showValues, options)
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
--先保存编队
|
||||
local curFormation = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_DREAMLAND)
|
||||
local choosedList={}
|
||||
|
|
Loading…
Reference in New Issue