dev_chengFeng
ZhangBiao 2020-08-19 17:18:38 +08:00
parent 2f6042154b
commit 32eadd13ef
44 changed files with 41 additions and 19 deletions

View File

@ -464,10 +464,6 @@ function this.InitQuickFightData(monsterGroupId, eventId, msg)
data.hpList[i] = msg.remainHpList[i]
end
-- 战前血量
local oldHp = this.GetMapTotalBlood()
-- 战后血量
local battledHp = 0
if msg.result == 0 then
--战斗失败回城
@ -478,7 +474,10 @@ function this.InitQuickFightData(monsterGroupId, eventId, msg)
-- 失败接受一下后端返回的位置
local lastPos = data.lastPos
Game.GlobalEvent:DispatchEvent(GameEvent.Map.DeadOut, 0, lastPos)
battledHp = 0
-- battledHp = 0
FormationManager.RefreshFormation(this.root.curFormationIndex,nil,
FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos)
else
MapManager.RefreshFormationHp(data)
Game.GlobalEvent:DispatchEvent(GameEvent.Map.ProgressChange, 2, 0, monsterGroupId)
@ -515,7 +514,7 @@ function this.InitQuickFightData(monsterGroupId, eventId, msg)
end
end
battledHp = this.GetMapTotalBlood()
if this.difficulty == 1 or this.difficulty == 3 or this.difficulty == 4 then
PopupText(strShow, 0.5, 2)
@ -531,7 +530,18 @@ function this.InitQuickFightData(monsterGroupId, eventId, msg)
end
end
Game.GlobalEvent:DispatchEvent(GameEvent.Formation.OnMapTeamHpReduce, oldHp - battledHp)
-- 战前血量
-- 战后血量
if MapManager.curCarbonType ~= CarBonTypeId.ENDLESS then
LogYellow("更新血量会走这里吧")
local oldHp = this.GetMapTotalBlood()
local battledHp = 0
battledHp = this.GetMapTotalBlood()
Game.GlobalEvent:DispatchEvent(GameEvent.Formation.OnMapTeamHpReduce, oldHp - battledHp)
end
end
-- 判断某一类型副本得到的总星数

View File

@ -119,7 +119,7 @@ function this.On_Btn2_Click()
this.EnterMapbyType(CarbonManager.difficulty, itemId)
end
else
LogGreen("进入的副本difficulty"..CarbonManager.difficulty.." itemId:"..tostring(itemId))
LogGreen("进入的副本difficulty:"..CarbonManager.difficulty.." itemId: "..tostring(itemId))
this.EnterMapbyType(CarbonManager.difficulty, itemId)
end

View File

@ -152,7 +152,8 @@ function this.InitData(msg)
--Log("msg.curXY : ".. msg.curXY)
this.totalEnergy =0
this.formationList = {}
-- this.formationList = {}--请滚
--Log("服务器英雄数量 msg.heroInfos " .. #msg.heroInfos)
-- for i=1, #msg.heroInfos do

View File

@ -51,6 +51,8 @@ function this:InitComponent()
this.leftUp = Util.GetGameObject(self.gameObject, "leftUp")
this.centerDonwn = Util.GetGameObject(self.gameObject, "centerDown")
this.endLessTitle = Util.GetGameObject(self.gameObject, "endLessTitle")
missionView.InitComponent(self.gameObject, this)
playerView.InitComponent(self.gameObject, this)
ctrlView.InitComponent(self.gameObject, this, playerView)
@ -179,6 +181,8 @@ function this:OnShow()
endLessMapView.OnShow()
pointHandleView.OnShow()
trialPanel:OnShow()
this.endLessTitle:SetActive(MapManager.curCarbonType == CarBonTypeId.ENDLESS)
Util.GetGameObject(self.gameObject,"leftCenter"):SetActive(MapManager.curCarbonType ~= CarBonTypeId.ENDLESS)
end
--界面打开时调用(用于子类重写)
@ -285,23 +289,25 @@ function this.InitRolePosition(pos, curMapId)
TileMapView.UpdateFunc()
if MapManager.isOpen then
this.SetRoleShow(scale, pos)
this.SetRoleShow(scale, pos,1)
end
MapManager.stepList = {}
end
-- 设置小人落地
function this.SetRoleShow(scale, pos)
function this.SetRoleShow(scale, pos,num)
Log("this.SetRoleShow(scale, pos)")
DoTween.To(DG.Tweening.Core.DOGetter_float(function () return TileMapView.GetMapMinScale() end),
DG.Tweening.Core.DOSetter_float(TileMapController.SetScale),
scale, 1):SetEase(Ease.Linear):OnComplete(function ()
-- this.Mask:SetActive(false)
playerView.Init(pos)
playerView.Init(pos,num)
-- 进图初始化完成
MapManager.FirstEnter = false
playerView.leader.transform:SetParent(ctrlView.Ctrl.transform)
-- leader的父级设置为Ctrl后Z轴的值发生了变化 需要重新设置
local v3 = playerView.leader.transform.localPosition

View File

@ -4,6 +4,7 @@ local this = ShowEnemyInfoPanel
local monsterGroupId
local _LiveName
local _LiveNode
local MapPanel
local trailConfig = ConfigManager.GetConfig(ConfigName.TrialConfig)
local heroConfig = ConfigManager.GetConfig(ConfigName.HeroConfig)
@ -23,6 +24,7 @@ function this:InitComponent()
this.e_level=Util.GetGameObject(this.root,"EnemyInfo/name/level/Text"):GetComponent("Text")
this.e_cancelBtn=Util.GetGameObject(this.root,"EnemyInfo/cancelBtn")
this.e_fightBtn=Util.GetGameObject(this.root,"EnemyInfo/fightBtn")
this.bottomBar=Util.GetGameObject(this.root,"EnemyInfo/bottomBar")
this.heroGrid=Util.GetGameObject(this.root,"EnemyInfo/bottomBar/heroList")
this.iconPre=Util.GetGameObject(this.root,"EnemyInfo/bottomBar/heroList/pre")
end
@ -119,11 +121,11 @@ end
function this:OnOpen(...)
monsterGroupId = ...
MapPanel,monsterGroupId = ...
end
function this:OnShow()
this.bottomBar:SetActive(MapManager.curCarbonType ~= CarBonTypeId.ENDLESS)
this.SetSelectHero()
end

View File

@ -599,7 +599,7 @@ end
--显示敌人信息面板
function this.ShowEnemyInfo(_monsterGroupId,eventId,showValues)
UIManager.OpenPanel(UIName.ShowEnemyInfoPanel,_monsterGroupId)
UIManager.OpenPanel(UIName.ShowEnemyInfoPanel,MapPanel,_monsterGroupId)
end
function this.KillAllBitch()

View File

@ -128,7 +128,7 @@ function this.OnOpen()
this.InitBoolState()
-- 开始探索请求
-- this.StartExplore()
MapPanel.SetRoleShow(MapManager.mapScale, MapManager.roleInitPos)
MapPanel.SetRoleShow(MapManager.mapScale, MapManager.roleInitPos,0)
-- 设置任务显示
this.SetTipShow()
-- 初始化行动力消耗的类型数值
@ -206,7 +206,7 @@ end
function this.SetTipShow()
Log("MapManager.curMapId ========== " .. MapManager.curMapId)
if not this.IsEndLessMap() then return end
-- if not this.IsEndLessMap() then return end
if not endLessData[MapManager.curMapId] then Log(Language[11286]) return end
this.areaName.text = endLessData[MapManager.curMapId].Info
EndLessMapManager.curMapName = endLessData[MapManager.curMapId].Info

View File

@ -64,13 +64,16 @@ function this.RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.Formation.OnMapTeamHpReduce, this.ReduceRoleHp)
end
function this.Init(pos)
function this.Init(pos,num)
local u, v = Map_Pos2UV(pos)
--(角色身上的数据, 主要是位置信息)
this.leaderMapData = TileMapView.GetMapData():GetMapData(u, v)
MapManager.curMapBornPos = Map_UV2Pos(this.leaderMapData.u, this.leaderMapData.v)
this.InitRolePre(u, v)
LogRed("NUM"..num)
if num ==1 then
this.InitRolePre(u, v)
end
SkeletonGraphic = Util.GetGameObject(this.leader, "root/ui/roleRoot/npc"):GetComponent("SkeletonGraphic")
SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete + idleFunc
SkeletonGraphic.AnimationState:SetAnimation(0, "lauch", false)

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.