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

dev_chengFeng
jiaoyangna 2020-08-20 16:08:18 +08:00
commit 6c52db4ec6
75 changed files with 528 additions and 368 deletions

View File

@ -1156,7 +1156,7 @@ RectTransform:
- {fileID: 4643422383628229334}
- {fileID: 3605886898423400740}
m_Father: {fileID: 224787418950452670}
m_RootOrder: 10
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
@ -1448,7 +1448,7 @@ RectTransform:
m_Children:
- {fileID: 6885256839564162491}
m_Father: {fileID: 224787418950452670}
m_RootOrder: 13
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -2228,7 +2228,6 @@ RectTransform:
- {fileID: 224592664444102612}
- {fileID: 7737561222015288609}
- {fileID: 224963046119617888}
- {fileID: 8047808549415794405}
- {fileID: 224388808449838792}
- {fileID: 224017108475201074}
- {fileID: 7216805993157252564}
@ -2241,6 +2240,7 @@ RectTransform:
- {fileID: 6221160384840256380}
- {fileID: 6661436527163171077}
- {fileID: 7216987480060324232}
- {fileID: 8047808549415794405}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -7286,7 +7286,7 @@ RectTransform:
- {fileID: 1115112384}
- {fileID: 2152693670462794979}
m_Father: {fileID: 224787418950452670}
m_RootOrder: 9
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -12253,7 +12253,7 @@ RectTransform:
- {fileID: 224491247109074960}
- {fileID: 224018975841611412}
m_Father: {fileID: 224787418950452670}
m_RootOrder: 7
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -37877,7 +37877,7 @@ RectTransform:
- {fileID: 224211717906432606}
- {fileID: 205422398411030658}
m_Father: {fileID: 224787418950452670}
m_RootOrder: 6
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@ -49057,7 +49057,7 @@ RectTransform:
- {fileID: 1671688726074919037}
- {fileID: 3726002528657978570}
m_Father: {fileID: 224787418950452670}
m_RootOrder: 17
m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -70580,7 +70580,7 @@ RectTransform:
- {fileID: 3262943830304729264}
- {fileID: 1141173458163028699}
m_Father: {fileID: 224787418950452670}
m_RootOrder: 11
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
@ -86228,7 +86228,7 @@ RectTransform:
- {fileID: 5148077565034289862}
- {fileID: 4857466979119767916}
m_Father: {fileID: 224787418950452670}
m_RootOrder: 14
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@ -95811,7 +95811,7 @@ RectTransform:
- {fileID: 8334169591857444300}
- {fileID: 3993143851427451889}
m_Father: {fileID: 224787418950452670}
m_RootOrder: 15
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -96039,7 +96039,7 @@ RectTransform:
- {fileID: 3802299605862912010}
- {fileID: 3852267165985031638}
m_Father: {fileID: 224787418950452670}
m_RootOrder: 12
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -96197,7 +96197,7 @@ RectTransform:
m_Children:
- {fileID: 8079517856685660528}
m_Father: {fileID: 224787418950452670}
m_RootOrder: 5
m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
@ -97206,7 +97206,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &6661436527163171077
RectTransform:
m_ObjectHideFlags: 0
@ -97220,11 +97220,11 @@ RectTransform:
m_Children:
- {fileID: 7341570097136637704}
m_Father: {fileID: 224787418950452670}
m_RootOrder: 16
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 138.23999, y: 91.1499}
m_AnchoredPosition: {x: 138.23999, y: 1808.4}
m_SizeDelta: {x: 276.5, y: 82.30005}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &5486231635445567020
@ -103793,7 +103793,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.00001502, y: 49.6}
m_AnchoredPosition: {x: -0.00001502, y: -50.3}
m_SizeDelta: {x: 161.92, y: 41.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1595659191610556054
@ -117792,7 +117792,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 224787418950452670}
m_RootOrder: 8
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}

View File

@ -2043,3 +2043,8 @@ HeroPanelBgByPropertyName = {
[3] = "r_hero_bg_yao",--妖
[4] = "r_hero_bg_dao",--道
}
--副本玩法类型
CarBonTypeId = {
TRIAL = 1,
ENDLESS = 2,
}

View File

@ -730,9 +730,9 @@ PLAYER_SAVEAMT_FIELD.number = 13
PLAYER_SAVEAMT_FIELD.index = 12
PLAYER_SAVEAMT_FIELD.label = 1
PLAYER_SAVEAMT_FIELD.has_default_value = false
PLAYER_SAVEAMT_FIELD.default_value = 0
PLAYER_SAVEAMT_FIELD.type = 5
PLAYER_SAVEAMT_FIELD.cpp_type = 1
PLAYER_SAVEAMT_FIELD.default_value = 0.0
PLAYER_SAVEAMT_FIELD.type = 1
PLAYER_SAVEAMT_FIELD.cpp_type = 5
PLAYER_RECHARGETIME_FIELD.name = "rechargeTime"
PLAYER_RECHARGETIME_FIELD.full_name = ".com.ljsd.jieling.protocols.Player.rechargeTime"
@ -5663,9 +5663,9 @@ MONTHCARDINFO_TOTLEAMT_FIELD.number = 4
MONTHCARDINFO_TOTLEAMT_FIELD.index = 3
MONTHCARDINFO_TOTLEAMT_FIELD.label = 1
MONTHCARDINFO_TOTLEAMT_FIELD.has_default_value = false
MONTHCARDINFO_TOTLEAMT_FIELD.default_value = 0
MONTHCARDINFO_TOTLEAMT_FIELD.type = 5
MONTHCARDINFO_TOTLEAMT_FIELD.cpp_type = 1
MONTHCARDINFO_TOTLEAMT_FIELD.default_value = 0.0
MONTHCARDINFO_TOTLEAMT_FIELD.type = 1
MONTHCARDINFO_TOTLEAMT_FIELD.cpp_type = 5
MONTHCARDINFO.name = "MonthCardInfo"
MONTHCARDINFO.full_name = ".com.ljsd.jieling.protocols.MonthCardInfo"

View File

@ -42,6 +42,7 @@ MAPENTERRESPONSE_SKIPFIGHT_FIELD = protobuf.FieldDescriptor();
MAPENTERRESPONSE_INFOS_FIELD = protobuf.FieldDescriptor();
MAPENTERRESPONSE_CURHERO_FIELD = protobuf.FieldDescriptor();
MAPENTERRESPONSE_ADDHPCOUNT_FIELD = protobuf.FieldDescriptor();
MAPENTERRESPONSE_MAPID_FIELD = protobuf.FieldDescriptor();
EVENTUPDATEREQUEST = protobuf.Descriptor();
EVENTUPDATEREQUEST_EVENTID_FIELD = protobuf.FieldDescriptor();
EVENTUPDATEREQUEST_OPTIONID_FIELD = protobuf.FieldDescriptor();
@ -550,11 +551,21 @@ MAPENTERRESPONSE_ADDHPCOUNT_FIELD.default_value = 0
MAPENTERRESPONSE_ADDHPCOUNT_FIELD.type = 5
MAPENTERRESPONSE_ADDHPCOUNT_FIELD.cpp_type = 1
MAPENTERRESPONSE_MAPID_FIELD.name = "mapId"
MAPENTERRESPONSE_MAPID_FIELD.full_name = ".com.ljsd.jieling.protocols.MapEnterResponse.mapId"
MAPENTERRESPONSE_MAPID_FIELD.number = 19
MAPENTERRESPONSE_MAPID_FIELD.index = 18
MAPENTERRESPONSE_MAPID_FIELD.label = 1
MAPENTERRESPONSE_MAPID_FIELD.has_default_value = false
MAPENTERRESPONSE_MAPID_FIELD.default_value = 0
MAPENTERRESPONSE_MAPID_FIELD.type = 5
MAPENTERRESPONSE_MAPID_FIELD.cpp_type = 1
MAPENTERRESPONSE.name = "MapEnterResponse"
MAPENTERRESPONSE.full_name = ".com.ljsd.jieling.protocols.MapEnterResponse"
MAPENTERRESPONSE.nested_types = {}
MAPENTERRESPONSE.enum_types = {}
MAPENTERRESPONSE.fields = {MAPENTERRESPONSE_MAPLIST_FIELD, MAPENTERRESPONSE_CURXY_FIELD, MAPENTERRESPONSE_HEROINFOS_FIELD, MAPENTERRESPONSE_LEFTTIME_FIELD, MAPENTERRESPONSE_TEMPORARYITEMS_FIELD, MAPENTERRESPONSE_FOODBUFFERS_FIELD, MAPENTERRESPONSE_WAKECELLS_FIELD, MAPENTERRESPONSE_MISSIONS_FIELD, MAPENTERRESPONSE_REVIVETIME_FIELD, MAPENTERRESPONSE_DIECOUNT_FIELD, MAPENTERRESPONSE_EXPLOREDETAIL_FIELD, MAPENTERRESPONSE_BUF_FIELD, MAPENTERRESPONSE_SIGNS_FIELD, MAPENTERRESPONSE_REFRESHINFO_FIELD, MAPENTERRESPONSE_SKIPFIGHT_FIELD, MAPENTERRESPONSE_INFOS_FIELD, MAPENTERRESPONSE_CURHERO_FIELD, MAPENTERRESPONSE_ADDHPCOUNT_FIELD}
MAPENTERRESPONSE.fields = {MAPENTERRESPONSE_MAPLIST_FIELD, MAPENTERRESPONSE_CURXY_FIELD, MAPENTERRESPONSE_HEROINFOS_FIELD, MAPENTERRESPONSE_LEFTTIME_FIELD, MAPENTERRESPONSE_TEMPORARYITEMS_FIELD, MAPENTERRESPONSE_FOODBUFFERS_FIELD, MAPENTERRESPONSE_WAKECELLS_FIELD, MAPENTERRESPONSE_MISSIONS_FIELD, MAPENTERRESPONSE_REVIVETIME_FIELD, MAPENTERRESPONSE_DIECOUNT_FIELD, MAPENTERRESPONSE_EXPLOREDETAIL_FIELD, MAPENTERRESPONSE_BUF_FIELD, MAPENTERRESPONSE_SIGNS_FIELD, MAPENTERRESPONSE_REFRESHINFO_FIELD, MAPENTERRESPONSE_SKIPFIGHT_FIELD, MAPENTERRESPONSE_INFOS_FIELD, MAPENTERRESPONSE_CURHERO_FIELD, MAPENTERRESPONSE_ADDHPCOUNT_FIELD, MAPENTERRESPONSE_MAPID_FIELD}
MAPENTERRESPONSE.is_extendable = false
MAPENTERRESPONSE.extensions = {}
EVENTUPDATEREQUEST_EVENTID_FIELD.name = "eventId"

View File

@ -922,9 +922,9 @@ GETPLAYERINFORESPONSE_AMOUNT_FIELD.number = 26
GETPLAYERINFORESPONSE_AMOUNT_FIELD.index = 25
GETPLAYERINFORESPONSE_AMOUNT_FIELD.label = 1
GETPLAYERINFORESPONSE_AMOUNT_FIELD.has_default_value = false
GETPLAYERINFORESPONSE_AMOUNT_FIELD.default_value = 0
GETPLAYERINFORESPONSE_AMOUNT_FIELD.type = 5
GETPLAYERINFORESPONSE_AMOUNT_FIELD.cpp_type = 1
GETPLAYERINFORESPONSE_AMOUNT_FIELD.default_value = 0.0
GETPLAYERINFORESPONSE_AMOUNT_FIELD.type = 1
GETPLAYERINFORESPONSE_AMOUNT_FIELD.cpp_type = 5
GETPLAYERINFORESPONSE_VIPDAILY_FIELD.name = "vipDaily"
GETPLAYERINFORESPONSE_VIPDAILY_FIELD.full_name = ".com.ljsd.jieling.protocols.GetPlayerInfoResponse.vipDaily"
@ -4158,9 +4158,9 @@ REFRESHRECHARGEINDICATION_AMOUNT_FIELD.number = 1
REFRESHRECHARGEINDICATION_AMOUNT_FIELD.index = 0
REFRESHRECHARGEINDICATION_AMOUNT_FIELD.label = 1
REFRESHRECHARGEINDICATION_AMOUNT_FIELD.has_default_value = false
REFRESHRECHARGEINDICATION_AMOUNT_FIELD.default_value = 0
REFRESHRECHARGEINDICATION_AMOUNT_FIELD.type = 5
REFRESHRECHARGEINDICATION_AMOUNT_FIELD.cpp_type = 1
REFRESHRECHARGEINDICATION_AMOUNT_FIELD.default_value = 0.0
REFRESHRECHARGEINDICATION_AMOUNT_FIELD.type = 1
REFRESHRECHARGEINDICATION_AMOUNT_FIELD.cpp_type = 5
REFRESHRECHARGEINDICATION_MONTHSAVEAMT_FIELD.name = "monthSaveAmt"
REFRESHRECHARGEINDICATION_MONTHSAVEAMT_FIELD.full_name = ".com.ljsd.jieling.protocols.RefreshRechargeIndication.monthSaveAmt"
@ -4168,9 +4168,9 @@ REFRESHRECHARGEINDICATION_MONTHSAVEAMT_FIELD.number = 2
REFRESHRECHARGEINDICATION_MONTHSAVEAMT_FIELD.index = 1
REFRESHRECHARGEINDICATION_MONTHSAVEAMT_FIELD.label = 1
REFRESHRECHARGEINDICATION_MONTHSAVEAMT_FIELD.has_default_value = false
REFRESHRECHARGEINDICATION_MONTHSAVEAMT_FIELD.default_value = 0
REFRESHRECHARGEINDICATION_MONTHSAVEAMT_FIELD.type = 5
REFRESHRECHARGEINDICATION_MONTHSAVEAMT_FIELD.cpp_type = 1
REFRESHRECHARGEINDICATION_MONTHSAVEAMT_FIELD.default_value = 0.0
REFRESHRECHARGEINDICATION_MONTHSAVEAMT_FIELD.type = 1
REFRESHRECHARGEINDICATION_MONTHSAVEAMT_FIELD.cpp_type = 5
REFRESHRECHARGEINDICATION_SMONTHSAVEAMT_FIELD.name = "smonthSaveAmt"
REFRESHRECHARGEINDICATION_SMONTHSAVEAMT_FIELD.full_name = ".com.ljsd.jieling.protocols.RefreshRechargeIndication.smonthSaveAmt"
@ -4178,9 +4178,9 @@ REFRESHRECHARGEINDICATION_SMONTHSAVEAMT_FIELD.number = 3
REFRESHRECHARGEINDICATION_SMONTHSAVEAMT_FIELD.index = 2
REFRESHRECHARGEINDICATION_SMONTHSAVEAMT_FIELD.label = 1
REFRESHRECHARGEINDICATION_SMONTHSAVEAMT_FIELD.has_default_value = false
REFRESHRECHARGEINDICATION_SMONTHSAVEAMT_FIELD.default_value = 0
REFRESHRECHARGEINDICATION_SMONTHSAVEAMT_FIELD.type = 5
REFRESHRECHARGEINDICATION_SMONTHSAVEAMT_FIELD.cpp_type = 1
REFRESHRECHARGEINDICATION_SMONTHSAVEAMT_FIELD.default_value = 0.0
REFRESHRECHARGEINDICATION_SMONTHSAVEAMT_FIELD.type = 1
REFRESHRECHARGEINDICATION_SMONTHSAVEAMT_FIELD.cpp_type = 5
REFRESHRECHARGEINDICATION.name = "RefreshRechargeIndication"
REFRESHRECHARGEINDICATION.full_name = ".com.ljsd.jieling.protocols.RefreshRechargeIndication"

View File

@ -19,9 +19,9 @@ function BattleEndPanel:BindEvent()
Util.AddClick(this.bg, function ()
self:ClosePanel()
if BattlePanel then
BattlePanel:ClosePanel()
end
-- if BattlePanel then
-- BattlePanel:ClosePanel()
-- end
end)
Util.AddClick(this.btnResult, function()
@ -60,7 +60,7 @@ function BattleEndPanel:OnOpen(battlePanel, hpList, drop, func, isShowResult)
end
-- 显示队伍信息
function this.RefreshTeamInfo(hpList)
function this.RefreshTeamInfo(hpList,self)
local curFormation = MapManager.formationList
ClearChild(this.roleGrid.transform)
for i = 1, 5 do
@ -85,15 +85,15 @@ function this.RefreshTeamInfo(hpList)
go.gameObject:SetActive(false)
end
end
for i = 1, #this.roleGrid.transform.childCount do
Util.AddParticleSortLayer(this.roleGrid.transform:GetChild(i - 1).gameObject, self.sortingOrder - orginLayer2)
end
orginLayer2 = selfsortingOrder
selfsortingOrder = self.sortingOrder
-- for i = 1, this.roleGrid.transform.childCount do
-- Util.AddParticleSortLayer(this.roleGrid.transform:GetChild(i - 1).gameObject, self.sortingOrder - orginLayer2)
-- end
-- orginLayer2 = selfsortingOrder
-- selfsortingOrder = self.sortingOrder
end
function this.OnSortingOrderChange()
for i = 1, #this.roleGrid.transform.childCount do
function this.OnSortingOrderChange(self)
for i = 1, this.roleGrid.transform.childCount do
Util.AddParticleSortLayer(this.roleGrid.transform:GetChild(i - 1).gameObject, self.sortingOrder - selfsortingOrder)
end
selfsortingOrder = self.sortingOrder

View File

@ -331,6 +331,7 @@ function this.BattleEnd(result)
or fightType == BATTLE_TYPE.GUILD_BOSS then
local levelId = FightPointPassManager.GetCurFightId()
NetManager.MapFightResultRequest(10000, "", levelId, fightType, function (msg)
LogPurple("结束的时候确认了?")
for i=1, #msg.remainHpList do
Log(Language[10262]..msg.remainHpList[i])
this.lastBattleResult.hpList[i] = msg.remainHpList[i]

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
if MapManager.curCarbonType == CarBonTypeId.ENDLESS then
FormationManager.RefreshFormation(FormationTypeDef.FORMATION_ENDLESS_MAP,{},{})
end
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,17 @@ function this.InitQuickFightData(monsterGroupId, eventId, msg)
end
end
Game.GlobalEvent:DispatchEvent(GameEvent.Formation.OnMapTeamHpReduce, oldHp - battledHp)
-- 战前血量
-- 战后血量
-- if MapManager.curCarbonType ~= CarBonTypeId.ENDLESS then
-- local oldHp = this.GetMapTotalBlood()
-- local battledHp = 0
-- battledHp = this.GetMapTotalBlood()
-- Game.GlobalEvent:DispatchEvent(GameEvent.Formation.OnMapTeamHpReduce, oldHp - battledHp)
-- end
end
-- 判断某一类型副本得到的总星数

View File

@ -345,7 +345,8 @@ function this.BtnClick(id)
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(id))
end
elseif id == FUNCTION_OPEN_TYPE.TRIAL then
LogGreen("CarbonTypePanelV2"..MapTrialManager.curTowerLevel)
LogGreen("CarbonTypePanelV2"..MapTrialManager.curTowerLevel)
if ActTimeCtrlManager.SingleFuncState(id) then
CarbonManager.difficulty = 2
local trialDataConfig = ConfigManager.GetConfig(ConfigName.TrialConfig)
@ -355,7 +356,8 @@ function this.BtnClick(id)
else
MapManager.curMapId = trialDataConfig[MapTrialManager.curTowerLevel].MapId
end
NetManager.MapInfoRequest(MapManager.curMapId, FormationTypeDef.FORMATION_DREAMLAND, function(msg)
MapManager.curCarbonType =CarBonTypeId.TRIAL
NetManager.MapInfoRequest(MapManager.curCarbonType, function(msg)
MapManager.isReloadEnter = false
MapTrialManager.firstEnter = true
MapManager.SetViewSize(20)--设置视野范围(明雷形式)

View File

@ -62,7 +62,8 @@ function EndLessCarbonPanel:BindEvent()
end)
Util.AddClick(this.btnFight, function ()
this.EnterMap(EndLessMapManager.openMapId)
LogGreen("开放的地图ID"..EndLessMapManager.openMapId)
this.EnterMap()
end)
@ -146,18 +147,18 @@ function this.RequestBlood(func)
end)
end
function this.EnterMap(mapId)
if not MapManager.isInMap then
function this.EnterMap()
-- if not MapManager.isInMap then
-- 进入地图编队,重新赋值一遍
CarbonManager.difficulty = CARBON_TYPE.ENDLESS
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.CARBON, mapId)
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.CARBON, MapManager.curMapId)
else
-- 在地图里又没勾新手引导, 无法进图
if MapManager.curMapId == 0 then
PopupTipPanel.ShowTip(Language[10361])
end
end
-- else
-- -- 在地图里又没勾新手引导, 无法进图
-- if MapManager.curMapId == 0 then
-- PopupTipPanel.ShowTip(Language[10361])
-- end
-- end
end
function this.InitCompShow()
@ -179,7 +180,6 @@ function this.InitCompShow()
end
function this.SetStaticData()
LogGreen("EndLessMapManager.openMapId "..EndLessMapManager.openMapId)
local mapData = endLessConfig[EndLessMapManager.openMapId]
if not mapData then Log(Language[10362]) end

View File

@ -68,13 +68,13 @@ function this.MapOutType(type)
this.effect:SetActive(true)
local timer
timer = Timer.New(function()
Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out, 1, 0)
Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out,0)
end, 1.5):Start()
elseif type == 2 then --试炼副本
Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out, 1, 0)
Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out,0)
elseif type == 4 then
Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out, 1, 0)
Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out,0)
end
end

View File

@ -55,7 +55,7 @@ end
function FormationEditPopup:BindEvent()
Util.AddClick(this.BtnBack, function()
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out, 1, 0)
Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out,0)
self:ClosePanel()
end)

View File

@ -120,12 +120,14 @@ function this.RefreshFormation(index, roleList, pokemonList,isDiffmonster)
curFormation.teamHeroInfos = {}
LogPink("#roleList"..#roleList)
for i = 1, #roleList do
local teamInfo = {}
teamInfo.heroId = roleList[i].heroId--roleList[i]
teamInfo.position = roleList[i].position--i
table.insert(curFormation.teamHeroInfos, teamInfo)
if not oldTeamheroInfos[teamInfo.heroId] then
LogRed("roleList[i].heroId"..roleList[i].heroId.." this.formationList[index].teamId"..this.formationList[index].teamId)
HeroManager.SetHeroFormationList(roleList[i].heroId,this.formationList[index].teamId,1)
end
end
@ -139,6 +141,7 @@ function this.RefreshFormation(index, roleList, pokemonList,isDiffmonster)
end
NetManager.TeamInfoSaveRequest(curFormation, function()
Game.GlobalEvent:DispatchEvent(GameEvent.Formation.OnFormationChange,isDiffmonster)
LogGreen("发送保存编队请求 ,长度:"..#curFormation.teamHeroInfos)
end)
this.CheckHeroIdExist()

View File

@ -15,12 +15,11 @@ this.IsNeedChangeFormation = true
--- 逻辑初始化
function this.Init(root, curMapId)
this.root = root
if CarbonManager.difficulty == CARBON_TYPE.ENDLESS then
-- if CarbonManager.difficulty == CARBON_TYPE.ENDLESS then
this.curMapId = EndLessMapManager.openMapId
else
this.curMapId = curMapId
end
-- else
-- this.curMapId = curMapId
-- end
this.InitView()
end
--- 获取需要显示的编队id
@ -119,6 +118,7 @@ function this.On_Btn2_Click()
this.EnterMapbyType(CarbonManager.difficulty, itemId)
end
else
LogGreen("进入的副本difficulty:"..CarbonManager.difficulty.." itemId: "..tostring(itemId))
this.EnterMapbyType(CarbonManager.difficulty, itemId)
end
@ -133,7 +133,7 @@ function this.EnterMapbyType(type, itemId)
end
local index = CarbonManager.difficulty == 4 and 401 or FormationManager.curFormationIndex
NetManager.MapInfoRequest(MapManager.curMapId, index, function()
NetManager.MapInfoRequest(MapManager.curCarbonType, function()
MapManager.curAreaId = this.root.curFormationIndex
-- ======== 副本额外的设置 =================================
@ -153,10 +153,10 @@ function this.EnterMapbyType(type, itemId)
-- MapTrialManager.firstEnter = true
elseif CarbonManager.difficulty == CARBON_TYPE.ENDLESS then
-- 是否已经开放
if not ActTimeCtrlManager.SingleFuncState(46) then
PopupTipPanel.ShowTip(Language[10722])
return
end
-- if not ActTimeCtrlManager.SingleFuncState(46) then
-- PopupTipPanel.ShowTip(Language[10722])
-- return
-- end
end
-- ===========================================================
MapManager.isReloadEnter = false
@ -232,7 +232,7 @@ end
-- 无尽副本设置
function this.EndLessCarbon()
if MapManager.isInMap then
if MapManager.Mapping then
this.root.bg:SetActive(true)
this.root.btn_1:SetActive(true)
this.root.btn_2:SetActive(false)

View File

@ -42,10 +42,6 @@ this.heroResolveLicence = {}
--this.allHeroProVal = {}--团体加成
--this.specialProVal = {}--减乘
function this.Initialize()
local hero_resolve_licence = string.split(ConfigManager.GetConfigData(ConfigName.SpecialConfig, 36).Value, "#")
for i = 1, #hero_resolve_licence do
this.heroResolveLicence[tonumber(hero_resolve_licence[i])] = tonumber(hero_resolve_licence[i])
end
for i = 1, WarPowerTypeAllNum do
this.allProVal[i] = {
singleHeroProVal = {},
@ -167,12 +163,12 @@ function this.UpdateHeroDatas(_msgHeroData, isFindHandBook)
end
function this.SetHeroFormationList(heroDid,teamId,isAddOrDel)
if isAddOrDel then
heroDatas[heroDid].formationList[teamId] = teamId
else
heroDatas[heroDid].formationList[teamId] = nil
end
if isAddOrDel and this.heroResolveLicence[teamId] then
heroDatas[heroDid].formationList[teamId] = teamId
else
heroDatas[heroDid].formationList[teamId] = nil
end
end
function this.GetHeroEquipIdList(heroDid)
@ -413,13 +409,6 @@ function this.DeleteHeroDatas(heroDIds)
FormationManager.AllFormationDeleCurHeroId(heroDIds[i])
--清除英雄魂印上挂载的英雄did
SoulPrintManager.hasEquipSoulPrintId[heroDIds[i]] = nil
--清除宝器上的英雄
local jewels = heroDatas[heroDIds[i]].jewels
if jewels and LengthOfTable(jewels) > 0 then
for i = 1, #jewels do
EquipTreasureManager.SetTreasureUpOrDown(jewels[i],"")
end
end
--删除远征英雄数据
ExpeditionManager.DelHeroHpValue(heroDatas[heroDIds[i]])
--删除英雄
@ -2908,13 +2897,7 @@ function this.ByCompoundHeroGetAllHeros()
local downSoryHeroList = {}
for i, v in pairs(heroDatas) do
if v.star == 4 or v.star == 5 or v.star == 3 then--四星 五星 才能加 3星 是狗粮
if #v.formationList ~= 0 then
local text = ""
for index, value in ipairs(v.formationList) do
text = HeroManager.GetHeroFormationStr(index)
end
v.isFormation = text
end
v.isFormation = ""
table.insert(upSortHeroList,v)
table.insert(downSoryHeroList,v)
end

View File

@ -175,7 +175,7 @@ function GMPanel:BindEvent()
end)
-- 测试跳过序章
Util.AddClick(this.btnPassMap, function ()
NetManager.MapInfoRequest(100, 1, function ()
NetManager.MapInfoRequest(1, function ()
NetManager.MapOutRequest(0, function ()
PopupTipPanel.ShowTip(Language[11153])
end)

View File

@ -708,6 +708,7 @@ function this:BindEvent()
end)
Util.AddClick(this.btnEndLess, function()
MapManager.curCarbonType = CarBonTypeId.ENDLESS
UIManager.OpenPanel(UIName.EndLessCarbonPanel)
end)
-- Util.AddClick(this.btnGuanxing, function()
@ -1093,38 +1094,38 @@ function this:Update()
end
end
if Input.GetMouseButtonDown(1) then
if ActTimeCtrlManager.SingleFuncState(30) then
CarbonManager.difficulty = 2
local trialDataConfig = ConfigManager.GetConfig(ConfigName.TrialConfig)
-- if Input.GetMouseButtonDown(1) then
-- if ActTimeCtrlManager.SingleFuncState(30) then
-- CarbonManager.difficulty = 2
-- local trialDataConfig = ConfigManager.GetConfig(ConfigName.TrialConfig)
if MapTrialManager.curTowerLevel>10000 then
MapManager.curMapId = MapTrialManager.GetSurprisedLevelMapId()
else
MapManager.curMapId = trialDataConfig[MapTrialManager.curTowerLevel].MapId
end
NetManager.MapInfoRequest(MapManager.curMapId, FormationTypeDef.FORMATION_DREAMLAND, function(msg)
MapManager.isReloadEnter = false
MapTrialManager.firstEnter = true
MapManager.SetViewSize(20)--设置视野范围(明雷形式)
MapManager.curAreaId =FormationTypeDef.FORMATION_DREAMLAND
MapManager.trialHeroInfo=msg.infos
SwitchPanel.OpenPanel(UIName.MapPanel)
end)
-- if MapTrialManager.curTowerLevel>10000 then
-- MapManager.curMapId = MapTrialManager.GetSurprisedLevelMapId()
-- else
-- MapManager.curMapId = trialDataConfig[MapTrialManager.curTowerLevel].MapId
-- end
-- NetManager.MapInfoRequest(MapManager.curCarbonType, function(msg)
-- MapManager.isReloadEnter = false
-- MapTrialManager.firstEnter = true
-- MapManager.SetViewSize(20)--设置视野范围(明雷形式)
-- MapManager.curAreaId =FormationTypeDef.FORMATION_DREAMLAND
-- MapManager.trialHeroInfo=msg.infos
-- SwitchPanel.OpenPanel(UIName.MapPanel)
-- end)
-- local curMapId = trialDataConfig[MapTrialManager.curTowerLevel].MapId
-- UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.CARBON, curMapId)
-- UIManager.OpenPanel(UIName.TrialCarbonPanel)
-- RedPointManager.PlayerPrefsSetStr(PlayerManager.uid .. "Trial", 1)
-- CheckRedPointStatus(RedPointType.EpicExplore_OpenCarbon)
-- this.RefreshOpenText(CARBON_TYPE.TRIAL, FUNCTION_OPEN_TYPE.TRIAL)
-- FunctionOpenMananger.CleadNewText(FUNCTION_OPEN_TYPE.TRIAL)
-- LogBlue(Language[11163])
else
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.TRIAL))
end
end
-- -- local curMapId = trialDataConfig[MapTrialManager.curTowerLevel].MapId
-- -- UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.CARBON, curMapId)
-- -- UIManager.OpenPanel(UIName.TrialCarbonPanel)
-- -- RedPointManager.PlayerPrefsSetStr(PlayerManager.uid .. "Trial", 1)
-- -- CheckRedPointStatus(RedPointType.EpicExplore_OpenCarbon)
-- -- this.RefreshOpenText(CARBON_TYPE.TRIAL, FUNCTION_OPEN_TYPE.TRIAL)
-- -- FunctionOpenMananger.CleadNewText(FUNCTION_OPEN_TYPE.TRIAL)
-- -- LogBlue(Language[11163])
-- else
-- PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.TRIAL))
-- end
-- end
end
-- 刷新功能显示

View File

@ -78,6 +78,7 @@ function this.UpDateTeamMaxHp(info)
}
end
MapManager.formationList = mapTeam
LogGreen("indication的编队长度"..#mapTeam)
CallBackOnPanelOpen(UIName.MapPanel, function ()
Game.GlobalEvent:DispatchEvent(GameEvent.Map.FormationHpChange)
end)
@ -86,6 +87,7 @@ end
-- 解析标记点的数据
function this.InitMapNoteData(signs)
LogPink("signs是"..signs)
-- 不是无尽副本,直接返回
if CarbonManager.difficulty ~= CARBON_TYPE.ENDLESS then return end
-- 初始化
@ -104,9 +106,11 @@ function this.InitMapNoteData(signs)
--Log("标记内容" .. data.noteInfo)
local u, v = Map_Pos2UV(data.notePos)
--Log("标记位置(" ..u .. ", " .. v .. ")")
-- this.PointNoteDataList[data.mapId][data.notePos] = data
this.PointNoteDataList[data.mapId][data.notePos] = data
end
end
LogPink("#PointNoteDataList"..#this.PointNoteDataList)
end
function this.InitRefreshPoint(refreshInfo, func)
@ -252,6 +256,7 @@ end
-- 判断队伍是否还有活着的人
function this.IsMapTeamAlive()
LogGreen("编队人数:"..#MapManager.formationList)
for i = 1, #MapManager.formationList do
if MapManager.formationList[i].allProVal[2] > 0 then
return true

View File

@ -124,6 +124,7 @@ function this.AwakeInit(go, mapId, wakeCells, tileV2)
_tileVMaxNum = _mapData.vLen
local u, v
LogRed("这里是根据已经走过的cell设置地图waleCells数量"..#wakeCells)
for i=1, #wakeCells do
u, v = Map_Pos2UV(wakeCells[i])
_mapData:UpdateFogArea(u, v, this.fogSize)

View File

@ -61,7 +61,7 @@ function this.InitVar()
this.lastPos = 0 -- 角色死亡前位置
this.isPoping = false -- 事件节点是否正在弹栈
this.isTimeOut = false -- 地图时间是否到了
this.mapPointList = {}
-- this.mapPointList = {}
this.leftStep = 0
this.isStopDying = false -- 是否立刻停止死亡
this.isInMap = false -- 是否在地图里
@ -71,6 +71,7 @@ function this.InitVar()
this.progressFull = false -- 探索100%
this.roleInitPos = 0 -- 换层时的出生位置
this.pointAtkPower = {} -- 每个事件点的战力
this.FirstEnter = false -- 刚进图区别OnShow
this.PlayedMapTypes = {} -- 已经进入过的副本类型(用与判断是否时第一次进入某类型的副本)
@ -81,6 +82,9 @@ function this.InitVar()
this.trialHeroInfo={}--试炼阵容信息
this.curHero=""--试炼副本当前上阵英雄
this.addHpCount=0 --回春散已使用次数
this.curCarbonType = 0--当前副本玩法类型(副本很多东西不用了,慢慢删,进图只用传 编队、玩法 之后服务器返回mapId)
this.Mapping = false
end
function this.InitData(msg)
@ -97,19 +101,19 @@ function this.InitData(msg)
--this.totalEnergy = this.leftStep - 5
--===================== 副本数据初始化 =========================
--Log("副本任务剩余时间 " .. msg.leftTime)
if this.curMapId > 0 then
-- 判断一下服务器返回的初始位置
local size = MapConfig[this.curMapId].Size
if u > size[1] or v > size[2] then
Log(Language[11190])
end
CarbonManager.difficulty = ChallengeData[this.curMapId].Type
end
-- if this.curMapId > 0 then
-- -- 判断一下服务器返回的初始位置
-- local size = MapConfig[this.curMapId].Size
-- if u > size[1] or v > size[2] then
-- Log(Language[11190])
-- end
-- CarbonManager.difficulty = ChallengeData[this.curMapId].Type
-- end
if challengeConfig[this.curMapId] then
this.totalTime = challengeConfig[this.curMapId].MapTime
end
Log(Language[11191] .. this.totalTime)
-- if challengeConfig[this.curMapId] then
-- this.totalTime = challengeConfig[this.curMapId].MapTime
-- end
-- Log(Language[11191] .. this.totalTime)
-- -- 复活剩余时间]
-- if msg.reviveTime then
@ -125,20 +129,20 @@ function this.InitData(msg)
-- end
local time = msg.leftTime
if time < 0 then
this.isOpen = false
else
-- local time = msg.leftTime
-- if time < 0 then
-- this.isOpen = false
-- else
this.isOpen = true
-- 已经计时的时间
local durationTime = this.totalTime - msg.leftTime
PlayerManager.startTime = PlayerManager.serverTime - durationTime
end
-- local durationTime = this.totalTime - msg.leftTime
-- PlayerManager.startTime = PlayerManager.serverTime - durationTime
-- end
-- 调用MissionManager初始化副本任务
MissionManager.InitMissionInfo(msg)
--=============================================
this.pointAtkPower = {}
--Log("地图点个数 " .. #msg.mapList)
Log("地图点个数 " .. #msg.mapList)
for i=1, #msg.mapList do
local cell = msg.mapList[i]
--Log("cell.cellId : "..cell.cellId)
@ -149,22 +153,23 @@ 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
local heroDid = msg.heroInfos[i].heroId
local curHeroData = HeroManager.GetSingleHeroData(heroDid)
local lv = ConfigManager.GetConfigData(ConfigName.HeroLevelConfig, curHeroData.lv).CharacterLevelPara
local allEquipAddProVal= HeroManager.CalculateWarAllProVal(heroDid)
allEquipAddProVal[2] = msg.heroInfos[i].heroHp
allEquipAddProVal[3] = msg.heroInfos[i].heroMaxHp
this.totalEnergy=this.totalEnergy+curHeroData.actionPower
this.formationList[i] = {
heroId = heroDid,
allProVal = allEquipAddProVal,
}
end
-- for i=1, #msg.heroInfos do
-- local heroDid = msg.heroInfos[i].heroId
-- local curHeroData = HeroManager.GetSingleHeroData(heroDid)
-- local lv = ConfigManager.GetConfigData(ConfigName.HeroLevelConfig, curHeroData.lv).CharacterLevelPara
-- local allEquipAddProVal= HeroManager.CalculateWarAllProVal(heroDid)
-- allEquipAddProVal[2] = msg.heroInfos[i].heroHp
-- allEquipAddProVal[3] = msg.heroInfos[i].heroMaxHp
-- this.totalEnergy=this.totalEnergy+curHeroData.actionPower
-- this.formationList[i] = {
-- heroId = heroDid,
-- allProVal = allEquipAddProVal,
-- }
-- end
-- 如果是重登,则进图时请求一次血量数据
@ -174,7 +179,7 @@ function this.InitData(msg)
end)
end
this.UpdateMaoShotTimeBagData(msg.temporaryItems)
-- this.UpdateMaoShotTimeBagData(msg.temporaryItems)
-- 获得所有的buff效果
--Log("******人物身上的buff数量 " .. #msg.foodBuffers)
@ -203,8 +208,8 @@ function this.InitData(msg)
-- 无尽副本
if msg.signs then
--Log("标记数量" .. #msg.signs)
EndLessMapManager.InitMapNoteData(msg.signs)
LogPurple("标记数量" .. #msg.signs)
-- EndLessMapManager.InitMapNoteData(msg.signs)
end
-- 时间点的刷新时间
@ -334,34 +339,34 @@ function this.InitAllMapProgressData(_curMapData)
end
end
function this.UpdateMaoShotTimeBagData(_temporaryItems)
if _temporaryItems.itemlist~=nil and #_temporaryItems.itemlist>0 then
for i = 1, #_temporaryItems.itemlist do
BagManager.InitMapShotTimeBagData(_temporaryItems.itemlist[i])
end
end
if _temporaryItems.equipId~=nil and #_temporaryItems.equipId>0 then
for i = 1, #_temporaryItems.equipId do
EquipManager.InitMapShotTimeEquipBagData(_temporaryItems.equipId[i])
end
end
if _temporaryItems.Hero~=nil and #_temporaryItems.Hero>0 then
for i = 1, #_temporaryItems.Hero do
HeroManager.InitMapShotTimeHeroBagData(_temporaryItems.Hero[i])
end
end
if _temporaryItems.soulEquip~=nil and #_temporaryItems.soulEquip>0 then
for i = 1, #_temporaryItems.soulEquip do
SoulPrintManager.InitMapShotTimeSoulPrintBagData(_temporaryItems.soulEquip[i])
end
end
-- function this.UpdateMaoShotTimeBagData(_temporaryItems)
-- if _temporaryItems.itemlist~=nil and #_temporaryItems.itemlist>0 then
-- for i = 1, #_temporaryItems.itemlist do
-- BagManager.InitMapShotTimeBagData(_temporaryItems.itemlist[i])
-- end
-- end
-- if _temporaryItems.equipId~=nil and #_temporaryItems.equipId>0 then
-- for i = 1, #_temporaryItems.equipId do
-- EquipManager.InitMapShotTimeEquipBagData(_temporaryItems.equipId[i])
-- end
-- end
-- if _temporaryItems.Hero~=nil and #_temporaryItems.Hero>0 then
-- for i = 1, #_temporaryItems.Hero do
-- HeroManager.InitMapShotTimeHeroBagData(_temporaryItems.Hero[i])
-- end
-- end
-- if _temporaryItems.soulEquip~=nil and #_temporaryItems.soulEquip>0 then
-- for i = 1, #_temporaryItems.soulEquip do
-- SoulPrintManager.InitMapShotTimeSoulPrintBagData(_temporaryItems.soulEquip[i])
-- end
-- end
-- if _temporaryItems.especialEquipId~=nil and #_temporaryItems.especialEquipId>0 then
-- for i = 1, #_temporaryItems.especialEquipId do
-- TalismanManager.InitMapShotTimeTalismanBagData(_temporaryItems.especialEquipId[i])
-- end
-- end
end
-- end
--前端更新地图进度 _type 2/3 怪物组id#次数/本次地图获得战斗胜利次数 4/8 行脚商人id#物品id /行脚商人id#物品类型 5 本地图采矿都少次 6 消耗行动力数量 7 宝箱
function this.UpdateMapProgressDatas(_type,_eventId,_monsterId,_num,_isSend)--没有数据可传0
--Log("UpdateMapProgressDatas _type,_eventId数据1 ".._type.." ".._eventId)
@ -416,10 +421,11 @@ function this.UpdateMapProgressData(_type, _data, _num, _isSend)
if _data.proressNum < _data.configData.Values[2][1] then
_data.proressNum = _data.proressNum + _num
if _data.proressNum >= _data.configData.Values[2][1] then
Log("_data:".._data.id)
if _type == 6 and _isSend then
NetManager.MapUpdateEvent(-1000)
end
Log("_data:".._data.id)
this.allMapProgressList[this.curMapId].totalWeight = this.allMapProgressList[this.curMapId].totalWeight + _data.configData.Score
Game.GlobalEvent:DispatchEvent(GameEvent.Map.ProgressChangeUpdateShow)
local weight = this.allMapProgressList[this.curMapId].totalWeight
@ -487,11 +493,15 @@ function this.MapUpdateEvent(pos, func)
if pos ~= -1000 then
MapManager.curTriggerPos = pos
end
LogGreen(tostring(pos))
LogYellow(tostring(#MapManager.mapPointList))
MapManager.mapPointId = MapManager.mapPointList[pos]
LogPink(tostring(MapManager.mapPointId))
Log(Language[11196] .. eventId)
if eventId~=0 then
MissionManager.EventPointTrigger(eventId)
else
elseif eventId == 0 and MapManager.curCarbonType == CarBonTypeId.TRIAL then
-- body
local style = MapPointConfig[MapManager.mapPointId].Style
MissionManager.MapPointTrigger(style)
end

View File

@ -459,6 +459,7 @@ function this.InitData()
end)
else
OptionBehaviourManager.JumpEventPoint(eventId, options[i], this, function ()
LogYellow("点击确定走了这?")
lastOptionDone = true
end)
end

View File

@ -32,7 +32,17 @@ function this:InitComponent()
this.xingYaoNum=Util.GetGameObject(this.btnXingYao,"num"):GetComponent("Text")
this.btnReward=Util.GetGameObject(self.gameObject,"leftCenter/btnReward")
this.btnXingYao=Util.GetGameObject(self.gameObject,"rightDown/btnXingYao")
this.btnBomb=Util.GetGameObject(self.gameObject,"rightDown/btnBomb")
this.btnBuff=Util.GetGameObject(self.gameObject,"rightDown/buff")
this.btnShop=Util.GetGameObject(self.gameObject,"rightDown/shop")
this.btnReset=Util.GetGameObject(self.gameObject,"rightDown/btnReset")
this.btnFormat=Util.GetGameObject(self.gameObject,"rightDown/btnFormat")
this.btnNode=Util.GetGameObject(self.gameObject,"rightDown/btnNote")
this.item = Util.GetGameObject(self.gameObject, "item")
this.selectHero = Util.GetGameObject(self.gameObject, "centerDown/selectHero")
this.selectHero:SetActive(false)
-- buff显示
@ -51,6 +61,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)
@ -107,10 +119,10 @@ function this.SetEndlessShow()
-- 无尽副本的回城设置
if CarbonManager.difficulty == 4 then
-- 先看看是否是能回去
if not EndLessMapManager.IsMapTeamAlive()then
PopupTipPanel.ShowTip(Language[11233])
return
end
-- if not EndLessMapManager.IsMapTeamAlive()then
-- PopupTipPanel.ShowTip(Language[11233])
-- return
-- end
-- 先发更新事件点协议
MapManager.MapUpdateEvent(-1000, function ()
@ -120,7 +132,7 @@ function this.SetEndlessShow()
end)
end)
else
Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out, 1, 0)
Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out,0)
end
end
-- ===============================================
@ -166,6 +178,7 @@ end
function this:OnShow()
UIManager.camera.clearFlags = CameraClearFlags.Depth
local mapId = MapManager.curMapId
LogYellow("MapManager.curMapId"..MapManager.curMapId)
--- 副本地图音效统一改成一个
SoundManager.PlayMusic(SoundConfig.BGM_CarbonMap)
-- 环境音
@ -178,6 +191,16 @@ 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)
this.btnXingYao:SetActive(MapManager.curCarbonType == CarBonTypeId.TRIAL)
this.btnBomb:SetActive(MapManager.curCarbonType == CarBonTypeId.TRIAL)
this.btnBuff:SetActive(MapManager.curCarbonType == CarBonTypeId.TRIAL)
this.btnShop:SetActive(MapManager.curCarbonType == CarBonTypeId.TRIAL)
this.btnReset:SetActive(MapManager.curCarbonType == CarBonTypeId.ENDLESS)
this.btnFormat:SetActive(MapManager.curCarbonType == CarBonTypeId.ENDLESS)
this.btnNode:SetActive(false)
end
--界面打开时调用(用于子类重写)
@ -226,8 +249,10 @@ end
---==================== 地图初始化处理部分 ==================================
function this.SetMapFog()
local mapId = MapManager.curMapId
local fogVal = ChallengeMapConfig[mapId].isShowFog
LogPink("地图初始化迷雾:"..tostring(fogVal))
if fogVal and fogVal == 0 then
TileMapView.isShowFog = false
else
@ -284,23 +309,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
@ -458,25 +485,28 @@ function this.RefreshShow()
pointHandleView.RefreshShow()
end
function this.OnMapOut(nextMapId, outType)
function this.OnMapOut(outType)
--出图不需要发协议了
Log("outType ====== " .. outType)
-- 无尽副本需要传目的地的地图ID
local distMapId = 0
if CarbonManager.difficulty == CARBON_TYPE.ENDLESS and nextMapId > 0 then
distMapId = nextMapId
end
-- local distMapId = 0
-- if CarbonManager.difficulty == CARBON_TYPE.ENDLESS and nextMapId > 0 then
-- distMapId = nextMapId
-- end
NetManager.MapOutRequest(outType, function (msg)
if nextMapId == 100 or nextMapId == 0 then
-- NetManager.MapOutRequest(outType, function (msg)
if outType == 0 then
this.BackHome()
elseif nextMapId == 1 then -- 正常出图
MapManager.Mapping = false
elseif outType == 1 then -- 正常出图
this.BackToCarbonPanel()
MapManager.Mapping = false
else --换层或者换地图
this.ChangeMapByType(nextMapId, msg)
this.ChangeMapByType()
end
Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd)
end, distMapId)
-- end, distMapId)
end
@ -563,27 +593,27 @@ function this.ResetMapData()
end
-- 换层或者换地图
function this.ChangeMapByType(nextMapId, msg)
function this.ChangeMapByType(msg)
local carbonType = CarbonManager.difficulty
-- 在试炼副本中的是换层操作
if carbonType == 2 then
Log(Language[11239])
this.TrialChangeFloor(nextMapId, msg)
this.TrialChangeFloor(msg)
elseif carbonType == 4 then
Log(Language[11240])
-- 执行换图方法
this.ChangeMap(nextMapId)
this.ChangeMap()
end
end
-- 试炼副本的换层操作
function this.TrialChangeFloor(nextMapId, msg)
function this.TrialChangeFloor(msg)
-- 设置不可点击
ctrlView.SetCtrlState(true)
this.ClearBag()
this.StopWalking()
NetManager.MapInfoRequest(nextMapId,FormationTypeDef.FORMATION_DREAMLAND, function ()
NetManager.MapInfoRequest(MapManager.curCarbonType,function ()
local triggerCallBack
triggerCallBack = function (panelType, panel)
if panelType == UIName.SwitchPanel then
@ -594,10 +624,10 @@ function this.TrialChangeFloor(nextMapId, msg)
Game.GlobalEvent:AddEvent(GameEvent.UI.OnClose, triggerCallBack)
-- 试炼副本的完成时间
if msg.useTime then
Log(Language[11241] .. msg.useTime)
MapTrialManager.doneTime = msg.useTime
end
-- if msg.useTime then
-- Log(Language[11241] .. msg.useTime)
-- MapTrialManager.doneTime = msg.useTime
-- end
SwitchPanel.OpenPanel(UIName.MapPanel)
MapTrialManager.isChangeLevel = false
if MapTrialManager.curTowerLevel<10000 then
@ -615,7 +645,7 @@ function this.ChangeMap(nextMapId)
Log(" nextMapId ====== " .. nextMapId)
local index = CarbonManager.difficulty == CARBON_TYPE.ENDLESS and 401 or FormationManager.curFormationIndex
NetManager.MapInfoRequest(nextMapId, index, function ()
NetManager.MapInfoRequest(nextMapId,function ()
local triggerCallBack
triggerCallBack = function (panelType, panel)
if panelType == UIName.SwitchPanel then

View File

@ -75,9 +75,10 @@ end
-- 进入下一层
function this.GoNextLevel()
local curMapId = trailConfig[MapTrialManager.curTowerLevel + 1].MapId
-- local curMapId = trailConfig[MapTrialManager.curTowerLevel + 1].MapId
this.isChangeLevel = true
Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out, curMapId, 1)
Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out, 2)
MapTrialManager.isHaveBoss = false
this.bossType = 0
end
@ -114,9 +115,10 @@ end
-- 张麻子:哈,大哥这他妈的惊喜啊,小弟我愿意等你三天
-- 黄四郎:好
function this.GoSurprisedLevel()
local mapId = this.GetSurprisedLevelMapId()
-- local mapId = this.GetSurprisedLevelMapId()
this.isChangeLevel = true
Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out, mapId, 1)
Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out,2)
MapTrialManager.isHaveBoss = false
this.bossType = 0
end

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
@ -50,6 +52,31 @@ function this:BindEvent()
end
end
if MapManager.curCarbonType == CarBonTypeId.ENDLESS then
local curFormation = MapManager.formationList
NetManager.QuickFightRequest(function(msg)
-- CarbonManager.InitQuickFightData(monsterGroupId, nil, msg)
local fightData = BattleManager.GetBattleServerData(msg)
UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.DAILY_CHALLENGE, function()
--更新精气值
LogGreen(Language[12222]..msg.essenceValue)
MapTrialManager.powerValue = msg.essenceValue
--召唤Boss
if CarbonManager.difficulty == CARBON_TYPE.TRIAL and MapTrialManager.powerValue >= 100 then
MapTrialManager.isHaveBoss = true
MapTrialManager.UpdatePowerValue(0)
end
-- 延迟一秒刷新显示,避免战斗界面关闭时地图界面没有打开,无法监听删点事件,导致怪物点无法删除的问题
Timer.New(function()
-- 刷新数据
CarbonManager.InitQuickFightData(monsterGroupId, nil, msg)
end, 0.2):Start()
end)
self:ClosePanel()
end)
else
--先保存编队
local curFormation = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_DREAMLAND)
local choosedList={}
@ -86,16 +113,19 @@ function this:BindEvent()
end)
self:ClosePanel()
end)
end
end)
end
function this:OnOpen(...)
monsterGroupId = ...
MapPanel,monsterGroupId = ...
end
function this:OnShow()
this.bottomBar:SetActive(MapManager.curCarbonType ~= CarBonTypeId.ENDLESS)
this.SetSelectHero()
end

View File

@ -69,6 +69,7 @@ function TrialMapPanel:InitComponent(root, mapPanel)
this.helpPos=this.helpBtn:GetComponent("RectTransform").localPosition
--boss召唤特效
this.bossEffect = Util.GetGameObject(root, "UI_effect_shilian_tab")
this.energyRoot = Util.GetGameObject(root, "stepROot")
end
@ -137,11 +138,13 @@ end
--界面打开时调用(用于子类重写)
function TrialMapPanel:OnOpen()
this.upView.gameObject:SetActive(CarbonManager.difficulty == 2)
this.powerRoot:SetActive(CarbonManager.difficulty == 2)
this.btnBomb:SetActive(CarbonManager.difficulty == 2)
-- 商店
this.buffShop:SetActive(CarbonManager.difficulty == CARBON_TYPE.TRIAL)
this.normalShop:SetActive(CarbonManager.difficulty == CARBON_TYPE.TRIAL)
this.energyRoot:SetActive(CarbonManager.difficulty == CARBON_TYPE.ENDLESS)
if CarbonManager.difficulty ~= 2 then return end
this.InitShowState()
@ -151,12 +154,14 @@ function TrialMapPanel:OnOpen()
end
function TrialMapPanel:OnShow()
end
function this.InitShowState()
if CarbonManager.difficulty ~= 2 then return end
istrialMap = CarbonManager.difficulty == 2
if istrialMap then this.InitTrial() end
this.upView.gameObject:SetActive(CarbonManager.difficulty ~= 4)
this.upView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main })
this.helpBtn:SetActive(istrialMap)
MapPanel.btnBag.gameObject:SetActive(false)
@ -380,23 +385,22 @@ function this.InitTrial()
MapTrialManager.canMove = true
MapManager.isRemoving = false
MapManager.deadTime = 0
if not MapManager.isOpen then
this.TrialMissionStart()
end
end
-- 试炼副本进图流程
function this.TrialMissionStart()
NetManager.CarbonMissionStartRequest(function(msg)
Log(Language[11258])
local showStr = Language[11259] .. MapTrialManager.curTowerLevel ..Language[10319]
UIManager.OpenPanel(UIName.CurlingTipPanel, showStr)
MapPanel.SetRoleShow(MapManager.mapScale, MapManager.roleInitPos)
PlayerManager.startTime = PlayerManager.serverTime
MissionManager.missionTime = 0
MapManager.isOpen = true
end)
-- if not MapManager.isOpen then
-- this.TrialMissionStart()
-- end
end
-- -- 试炼副本进图流程
-- function this.TrialMissionStart()
-- NetManager.CarbonMissionStartRequest(function(msg)
-- Log(Language[11258])
-- local showStr = Language[11259] .. MapTrialManager.curTowerLevel ..Language[10319]
-- UIManager.OpenPanel(UIName.CurlingTipPanel, showStr)
-- MapPanel.SetRoleShow(MapManager.mapScale, MapManager.roleInitPos)
-- PlayerManager.startTime = PlayerManager.serverTime
-- MissionManager.missionTime = 0
-- MapManager.isOpen = true
-- end)
-- end
-- 试炼副本显示时间
function this.TrialShowTime()
@ -465,7 +469,7 @@ end
function this.SetSelectHero(isFirstIn,isFirstData,isMainIn)
local itemId=trialSetting[1].HealingId[1]
local itemNum=trialSetting[1].HealingId[2]
this.selectHero:SetActive(true)
this.selectHero:SetActive((true) and (MapManager.curCarbonType == CarBonTypeId.TRIAL))
local d={}
if isFirstIn then--若是第一次进 此时我必有该英雄 不用担心是已删除英雄 通过HeroDid去获取数据
for n, did in ipairs(isFirstData) do
@ -596,7 +600,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

@ -57,6 +57,10 @@ function this.InitComponent(gameObject, mapPanel)
-- 购买行动力的货币
this.moneyNum = Util.GetGameObject(gameObject, "endLessTitle/frame/num")
this.moneyIcon = Util.GetGameObject(gameObject, "endLessTitle/frame/icon")
this.helpBtn=Util.GetGameObject(gameObject,"helpBtn")
this.helpPos=this.helpBtn:GetComponent("RectTransform").localPosition
this.helpBtn:SetActive(false)
end
function this.OnSortingOrderChange()
@ -64,6 +68,10 @@ function this.OnSortingOrderChange()
end
function this.BindEvent()
--帮助按钮
Util.AddClick(this.helpBtn,function()
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.Sunro,this.helpPos.x,this.helpPos.y)
end)
-- 重置
Util.AddClick(this.btnReset, function ()
if not this.CanClick() then return end
@ -127,13 +135,16 @@ function this.OnOpen()
-- 初始化各种标志的状态
this.InitBoolState()
-- 开始探索请求
this.StartExplore()
-- this.StartExplore()
-- MapPanel.SetRoleShow(MapManager.mapScale, MapManager.roleInitPos,0)
-- 设置任务显示
this.SetTipShow()
-- 初始化行动力消耗的类型数值
this.InitCostValue()
this.RefreshEnergyValue(true, 0)
this.RefreshEnergyShow()
Util.GetGameObject(MapPanel.gameObject, "centerDown/selectHero"):SetActive(false)
this.helpBtn:SetActive(false)
-- 检测引导
GuideManager.CheckCarbonGuild(CARBON_TYPE.ENDLESS)
@ -160,7 +171,6 @@ function this.OnShow()
pointView.RefreshAtkShow()
end
EndLessMapManager.openedFormat = false
this.isPanelClose = false
@ -169,18 +179,18 @@ function this.OnShow()
end
-- ================ 进入地图的正常流程 ===============
function this.StartExplore()
if not this.IsEndLessMap() then return end
if MapManager.isOpen == false then
NetManager.CarbonMissionStartRequest(function(msg)
Log(Language[11258])
MapPanel.SetRoleShow(MapManager.mapScale, MapManager.roleInitPos)
PlayerManager.startTime = PlayerManager.serverTime
MissionManager.missionTime = 0
MapManager.isOpen = true
end)
end
end
-- function this.StartExplore()
-- if not this.IsEndLessMap() then return end
-- if MapManager.isOpen == false then
-- NetManager.CarbonMissionStartRequest(function(msg)
-- Log(Language[11258])
-- MapPanel.SetRoleShow(MapManager.mapScale, MapManager.roleInitPos)
-- PlayerManager.startTime = PlayerManager.serverTime
-- MissionManager.missionTime = 0
-- MapManager.isOpen = true
-- end)
-- end
-- end
function this.InitCompShow(carbonType)
if carbonType ~= CARBON_TYPE.ENDLESS then
@ -189,7 +199,7 @@ function this.InitCompShow(carbonType)
this.areaName.gameObject:SetActive(carbonType == CARBON_TYPE.ENDLESS)
this.btnReset:SetActive(carbonType == CARBON_TYPE.ENDLESS)
this.btnFormat:SetActive(carbonType == CARBON_TYPE.ENDLESS)
this.btnNote:SetActive(carbonType == CARBON_TYPE.ENDLESS)
this.btnNote:SetActive(false)
-- this.warnRoot:SetActive(carbonType == CARBON_TYPE.ENDLESS)
-- this.warn:SetActive(false)
this.btnSet:SetActive(carbonType == CARBON_TYPE.ENDLESS)
@ -205,7 +215,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
@ -308,6 +318,7 @@ end
-- 根据类型刷新行动力数值
function this.RefreshEnergyValue(isInit, costType)
-- 只是初始化返回
-- LogBlue("两次吧")
if isInit then return end
if EndLessMapManager.justEnterMap then
EndLessMapManager.justEnterMap = false

View File

@ -240,18 +240,18 @@ function this.SetCarbonShowType(mission)
this.DragCtrl:SetActive(true)
if MapManager.curMapId == 100 then
-- 直接开始
NetManager.CarbonMissionStartRequest(function(msg)
local mission = MissionManager.carBonMission
UIManager.OpenPanel(UIName.CurlingTipPanel, Language[11312])
Log(Language[11313] .. msg.leftTime)
if msg.leftTime > 0 then --开启任务
-- 刷新任务
Game.GlobalEvent:DispatchEvent(GameEvent.Mission.OnMissionAdd, mission)
started = true
else
MapManager.isOpen = false
end
end)
-- NetManager.CarbonMissionStartRequest(function(msg)
-- local mission = MissionManager.carBonMission
-- UIManager.OpenPanel(UIName.CurlingTipPanel, Language[11312])
-- Log(Language[11313] .. msg.leftTime)
-- if msg.leftTime > 0 then --开启任务
-- -- 刷新任务
-- Game.GlobalEvent:DispatchEvent(GameEvent.Mission.OnMissionAdd, mission)
-- started = true
-- else
-- MapManager.isOpen = false
-- end
-- end)
else
UIManager.OpenPanel(UIName.CarbonMissionPopup, this)
end

View File

@ -47,7 +47,7 @@ function this.InitComponent(gameObject, mapPanel)
end
function this.AddListener()
Game.GlobalEvent:AddEvent(GameEvent.Map.FormationHpChange, this.OnRefreshFormationHp)
-- Game.GlobalEvent:AddEvent(GameEvent.Map.FormationHpChange, this.OnRefreshFormationHp)
Game.GlobalEvent:AddEvent(GameEvent.Map.Transport, this.OnPosTransport)
Game.GlobalEvent:AddEvent(GameEvent.FoodBuff.OnFoodBuffStart, this.OnFoodBuffStartRefresh)
Game.GlobalEvent:AddEvent(GameEvent.FoodBuff.OnFoodBuffEnd, this.RefreshRoleBuff)
@ -56,7 +56,7 @@ function this.AddListener()
end
function this.RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.Map.FormationHpChange, this.OnRefreshFormationHp)
-- Game.GlobalEvent:RemoveEvent(GameEvent.Map.FormationHpChange, this.OnRefreshFormationHp)
Game.GlobalEvent:RemoveEvent(GameEvent.Map.Transport, this.OnPosTransport)
Game.GlobalEvent:RemoveEvent(GameEvent.FoodBuff.OnFoodBuffStart, this.OnFoodBuffStartRefresh)
Game.GlobalEvent:RemoveEvent(GameEvent.FoodBuff.OnFoodBuffEnd, this.RefreshRoleBuff)
@ -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)
@ -94,7 +97,7 @@ function this.Init(pos)
this.ShowPos(u, v)
-- 刷新队伍血量
this.OnRefreshFormationHp()
-- this.OnRefreshFormationHp()
isRoleWalk = false
end
@ -106,7 +109,7 @@ function this.OnShow()
-- 刚进图时或者从战斗界面退出来时不刷新
if not MapManager.FirstEnter and not EndLessMapManager.isOpenedFullPanel then
this.OnRefreshFormationHp()
-- this.OnRefreshFormationHp()
end
if CarbonManager.difficulty == CARBON_TYPE.ENDLESS then
@ -249,7 +252,10 @@ function this.OnRefreshFormationHp()
-- 刷新队伍血量百分比
local curHp = 0
local maxHp = 0
LogRed("mapplayerView中的#MapManager.formationList"..#MapManager.formationList)
for i=1, #MapManager.formationList do
-- LogYellow(tostring(MapManager.formationList[i].allProVal[2]))
-- LogYellow(tostring(MapManager.formationList[i].allProVal[3]))
curHp = MapManager.formationList[i].allProVal[2] + curHp
maxHp = maxHp + MapManager.formationList[i].allProVal[3]
end

View File

@ -90,6 +90,7 @@ function MapPointView.New(u, v, pointId)
setmetatable(instance, MapPointView)
local cell = MapPointConfig[pointId]
if not cell then
-- LogRed("not cell return")
return
end
instance.cell = cell
@ -97,6 +98,7 @@ function MapPointView.New(u, v, pointId)
instance.v = v
if cell.Style == 8 then --阻挡点不处理
TileMapView.GetTileData(u, v).val = 2
-- LogRed("cell.Style == 8 return")
return
elseif cell.Style == 2 then --矿
elseif cell.Style == 7 then --宝箱

View File

@ -39,6 +39,7 @@ function this.GeneratePoint()
for k, v in pairs(MapManager.mapPointList) do
local x, y = Map_Pos2UV(k)
-- LogYellow("X:"..x.." Y"..y)
this.GenEventPoint(x, y, v)
end
@ -51,15 +52,18 @@ function this.GeneratePoint()
this.ShowSawPoints()
-- 初始化标记点
if CarbonManager.difficulty == CARBON_TYPE.ENDLESS then
for pos, data in pairs(EndLessMapManager.PointNoteDataList[MapManager.curMapId]) do
this.OnAddNotePoint(pos, data.noteInfo)
end
-- -- 初始化标记点
-- if CarbonManager.difficulty == CARBON_TYPE.ENDLESS then
-- for pos, data in pairs(EndLessMapManager.PointNoteDataList[4401]) do--MapManager.curMapId]) do
-- this.OnAddNotePoint(pos, data.noteInfo)
-- end
-- end
if MapManager.curCarbonType == CarBonTypeId.ENDLESS then
-- 设置一下战力的显示
this.RefreshAtkShow()
end
-- 设置一下战力的显示
this.RefreshAtkShow()
end
function this.OnShow()
@ -92,6 +96,7 @@ end
function this.GenEventPoint(u, v, pointId)
local pointView = MapPointView.New(u, v, pointId)
if pointView then
-- LogGreen("生成了事件点")
pointView.go.transform:SetParent(Util.GetTransform(this.Ctrl, "uiObj#"))
pointView.go:GetComponent("RectTransform").anchoredPosition3D = TileMapView.GetLiveTilePos(u, v) * 100
pointView.go.transform.localScale = Vector3.one
@ -375,7 +380,9 @@ end
-- 刷新走过的路径中出现的点
function this.ShowSawPoints()
if CarbonManager.difficulty ~= CARBON_TYPE.ENDLESS then return end
LogYellow("#MapManager.wakeCells:"..#MapManager.wakeCells)
if #MapManager.wakeCells == 0 then Log(Language[11322]) return end
for pos, point in pairs(this.EventPoint) do
local u0, v0 = Map_Pos2UV(pos)

View File

@ -36,6 +36,7 @@ function this.SeqExcuteNodeArray(nodeInfoList, func)
if type(arg) == "function" then
arg = arg(...)
end
LogRed("option是"..option)
local BHNode = this.BHNodeList[option]
if not BHNode then
Log(Language[11357] .. option)

View File

@ -277,9 +277,16 @@ end
-- 前往下一层界面
local mapDialoguePanel = function(showType, eventId, showValues, options)
--现已做成三级弹窗
if not UIManager.IsOpen(UIName.GeneralPopup) then
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.TrialToNextFloor, showType, eventId, showValues, options)
if MapManager.curCarbonType == CarBonTypeId.ENDLESS then
if not UIManager.IsOpen(UIName.MapOptionPanel) then
UIManager.OpenPanel(UIName.MapOptionPanel,showType, eventId, showValues, options)
end
else
if not UIManager.IsOpen(UIName.GeneralPopup) then
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.TrialToNextFloor, showType, eventId, showValues, options)
end
end
end
-- 进度条界面
@ -302,24 +309,44 @@ local directFight = function(showType, eventId, showValues, options)
else--快速战斗
-- --如果英雄阵亡 无法选择其进行战斗
--先保存编队
local curFormation = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_DREAMLAND)
local choosedList={}
table.insert(choosedList, {heroId = MapTrialManager.selectHeroDid, position=2})
FormationManager.RefreshFormation(FormationTypeDef.FORMATION_DREAMLAND,choosedList,
FormationManager.formationList[FormationTypeDef.FORMATION_DREAMLAND].teamPokemonInfos)
if MapManager.curCarbonType == CarBonTypeId.ENDLESS then--无尽副本
-- body
LogPink("当前Mapmanager中的编队长度"..#MapManager.formationList)
LogBlue("当前FormationManager中的编队长度"..#FormationManager.formationList)
-- local curFormation = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_ENDLESS_MAP)
local curFormation = MapManager.formationList
LogGreen("战斗的编队长队:"..#curFormation)
-- FormationManager.RefreshFormation(FormationTypeDef.FORMATION_ENDLESS_MAP,curFormation,
-- FormationManager.formationList[FormationTypeDef.FORMATION_ENDLESS_MAP].teamPokemonInfos)
LogYellow("MapManager.curMapId22:"..MapManager.curMapId)
NetManager.QuickFightRequest(function(msg)
CarbonManager.InitQuickFightData(monsterGroupId, eventId, msg)
-- MapTrialManager.SetHeroHp(msg.remainHpList,MapTrialManager.selectHeroDid)
LogPink("战斗后Mapmanager中的编队长度"..#MapManager.formationList)
LogBlue("战斗后FormationManager中的编队长度"..#FormationManager.formationList)
end)
else
local curFormation = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_DREAMLAND)
local choosedList={}
table.insert(choosedList, {heroId = MapTrialManager.selectHeroDid, position=2})
FormationManager.RefreshFormation(FormationTypeDef.FORMATION_DREAMLAND,choosedList,
FormationManager.formationList[FormationTypeDef.FORMATION_DREAMLAND].teamPokemonInfos)
NetManager.QuickFightRequest(function(msg)
--更新英雄HP
MapTrialManager.SetHeroHp(msg.remainHpList,MapTrialManager.selectHeroDid)
CarbonManager.InitQuickFightData(monsterGroupId, eventId, msg)
--更新精气值
MapTrialManager.powerValue = msg.essenceValue
-- --召唤Boss
if CarbonManager.difficulty == CARBON_TYPE.TRIAL and MapTrialManager.powerValue >= 100 then
MapTrialManager.isHaveBoss = true
MapTrialManager.UpdatePowerValue(0)
end
end)
end
NetManager.QuickFightRequest(function(msg)
--更新英雄HP
MapTrialManager.SetHeroHp(msg.remainHpList,MapTrialManager.selectHeroDid)
CarbonManager.InitQuickFightData(monsterGroupId, eventId, msg)
--更新精气值
MapTrialManager.powerValue = msg.essenceValue
-- --召唤Boss
if CarbonManager.difficulty == CARBON_TYPE.TRIAL and MapTrialManager.powerValue >= 100 then
MapTrialManager.isHaveBoss = true
MapTrialManager.UpdatePowerValue(0)
end
end)
end
Game.GlobalEvent:DispatchEvent(GameEvent.Map.RefreshHeroHp,false,nil,false)
end

View File

@ -265,7 +265,7 @@ function this.UpdateEventPoint(msg, optionId, func)
{"DeletePoint", {pos = MapManager.curTriggerPos}},
}
elseif behaviorType == 47 then -- 跨地图传送
EndLessMapManager.TranssportByMapId(beArgs[1][1])
-- EndLessMapManager.TranssportByMapId(beArgs[1][1])
elseif behaviorType == 48 then
behaviorNodeList = {
{"Battle", {monsterID = beArgs[1][2]}, this.SetNextEventId},
@ -324,6 +324,7 @@ function this.JumpEventPoint(eventId, optionId, panel, func)
return
end
NetManager.EventUpdateRequest(eventId, optionId, function ()
LogYellow("点击之后走了这?")
panel:ClosePanel()
this.CurTriggerPanel = nil
Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd)

View File

@ -335,17 +335,17 @@ function this.MapFightResultRequest(monsterGroupId, frames, fightId, fightType,
end
--请求地图数据
function this.MapInfoRequest(mapId, teamId, func)
Log(Language[11427] .. mapId)
function this.MapInfoRequest(mapModeId,func)
Log(Language[11427] .. mapModeId)
local data = MapInfoProto_pb.MapEnterRequest()
data.mapId = mapId
data.teamId = teamId
data.mapId = mapModeId
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.MAP_ENTER_REQUEST, MessageTypeProto_pb.MAP_ENTER_RESPONSE, msg, function(buffer)
local data = buffer:DataByte()
local msg = MapInfoProto_pb.MapEnterResponse()
msg:ParseFromString(data)
MapManager.curMapId = mapId
MapManager.curMapId = msg.mapId
LogRed("服务器返回的MapID:"..msg.mapId)
MapManager.mapPointList = {}
EndLessMapManager.PointNoteDataList = {}
MapManager.InitData(msg)
@ -358,6 +358,7 @@ function this.MapInfoRequest(mapId, teamId, func)
end
-- 请求进图后
MapManager.isInMap = true
MapManager.Mapping = true
end)
end
@ -400,18 +401,18 @@ function this.MapOutRequest(outType, func, nextMapId)
end)
end
-- 请求开始探索副本地图
function this.CarbonMissionStartRequest(func)
Network:SendMessageWithCallBack(MessageTypeProto_pb.MAP_START_EXPLORE_REQUEST, MessageTypeProto_pb.MAP_START_EXPLORE_RESPONSE, nil, function(buffer)
local data = buffer:DataByte()
local msg = MapInfoProto_pb.MapStartExploreResponse()
msg:ParseFromString(data)
if func then
func(msg)
end
-- -- 请求开始探索副本地图
-- function this.CarbonMissionStartRequest(func)
-- Network:SendMessageWithCallBack(MessageTypeProto_pb.MAP_START_EXPLORE_REQUEST, MessageTypeProto_pb.MAP_START_EXPLORE_RESPONSE, nil, function(buffer)
-- local data = buffer:DataByte()
-- local msg = MapInfoProto_pb.MapStartExploreResponse()
-- msg:ParseFromString(data)
-- if func then
-- func(msg)
-- end
end)
end
-- end)
-- end
--请求更新事件
function this.EventUpdateRequest(eventId, optionId, func)

View File

@ -38,17 +38,20 @@ function BattleWinPopup:NextStep()
if not hadClick then -- 避免重复结算
hadClick = true
if m_isBack then
if m_battlePanel then
m_battlePanel:ClosePanel()
end
-- if m_battlePanel then
-- m_battlePanel:ClosePanel()
-- end
self:ClosePanel()
return
end
if m_fightType == 2 then --副本战斗结算
-- UIManager.OpenPanel(UIName.RewardItemPopup, m_battleResult.drop, 2, function()
MapManager.DropAddShotTimeBag(m_battleResult.drop)
UIManager.OpenPanel(UIName.BattleEndPanel, m_battlePanel, m_battleResult.hpList, m_battleResult.drop, function() m_battlePanel:ClosePanel() self:ClosePanel() end, true)
-- MapManager.DropAddShotTimeBag(m_battleResult.drop)
UIManager.OpenPanel(UIName.BattleEndPanel, m_battlePanel, m_battleResult.hpList, m_battleResult.drop, function()
m_battlePanel:ClosePanel()
self:ClosePanel()
end, true)
-- end)
elseif m_fightType == 3 then --限时怪战斗结算
UIManager.OpenPanel(UIName.RewardItemPopup, m_battleResult.drop, 1,function() m_battlePanel:ClosePanel() self:ClosePanel() end, 1, true)

View File

@ -49,20 +49,20 @@ end
--绑定事件(用于子类重写)
function CarbonMissionPopup:BindEvent()
Util.AddClick(this.btnConfirm, function ()
-- 点击后依次播放动画
this.BtnCallBack(isStartExplore)
end)
-- Util.AddClick(this.btnConfirm, function ()
-- -- 点击后依次播放动画
-- this.BtnCallBack(isStartExplore)
-- end)
end
function this.BtnCallBack(start)
if start then
this.StartMission(1.8)
else
this.SetStartAni(1)
end
this.letterAni:SetBool("isEnd", not start)
end
-- function this.BtnCallBack(start)
-- if start then
-- this.StartMission(1.8)
-- else
-- this.SetStartAni(1)
-- end
-- this.letterAni:SetBool("isEnd", not start)
-- end
-- 播放开始探索
function this.SetStartAni(timeScale)
@ -77,30 +77,30 @@ function this.SetStartAni(timeScale)
end
-- 开始任务
function this.StartMission(timeScale)
this.exploreAni:SetTrigger("close")
Timer.New(function()
this:ClosePanel()
this.StartExplore()
end, timeScale):Start()
end
-- function this.StartMission(timeScale)
-- this.exploreAni:SetTrigger("close")
-- Timer.New(function()
-- this:ClosePanel()
-- this.StartExplore()
-- end, timeScale):Start()
-- end
-- 开始地图探索
function this.StartExplore()
if not started then
started = true
NetManager.CarbonMissionStartRequest(function(msg)
local mission = MissionManager.carBonMission
Log(Language[11313] .. msg.leftTime)
if msg.leftTime > 0 then --开启任务
-- 刷新任务
Game.GlobalEvent:DispatchEvent(GameEvent.Mission.OnMissionAdd, mission)
else
MapManager.isOpen = false
end
end)
end
end
-- function this.StartExplore()
-- if not started then
-- started = true
-- NetManager.CarbonMissionStartRequest(function(msg)
-- local mission = MissionManager.carBonMission
-- Log(Language[11313] .. msg.leftTime)
-- if msg.leftTime > 0 then --开启任务
-- -- 刷新任务
-- Game.GlobalEvent:DispatchEvent(GameEvent.Mission.OnMissionAdd, mission)
-- else
-- MapManager.isOpen = false
-- end
-- end)
-- end
-- end
--添加事件监听(用于子类重写)
function CarbonMissionPopup:AddListener()

View File

@ -55,6 +55,8 @@ function this:OnShow(_parent,...)
go:SetActive(false)
end
end
btns[2]:SetActive(MapManager.curCarbonType == CarBonTypeId.TRIAL)
btns[3]:SetActive(MapManager.curCarbonType == CarBonTypeId.TRIAL)
end
function this:OnClose()

View File

@ -43,6 +43,7 @@ end
--- 重新获取商店数据
function this.RequestAllShopData(func)
LogRed("商店")
NetManager.RequestMainShopData(func)
end

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.