无尽副本修改提交

dev_chengFeng
jiaoyangna 2021-05-26 17:27:47 +08:00
parent bb2cd6a263
commit 618d8094ea
9 changed files with 215 additions and 149 deletions

View File

@ -22783,8 +22783,8 @@ RectTransform:
m_Father: {fileID: 2574529201874018074}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 2, y: -20}
m_Pivot: {x: 0.5, y: 0.5}
@ -58549,6 +58549,86 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u8FDB\u5165\u6218\u6597"
LanguageIndex: 0
--- !u!1 &4406315951517480307
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1895834760144212735}
- component: {fileID: 8762750754796979343}
- component: {fileID: 758672339545280508}
m_Layer: 5
m_Name: tip1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1895834760144212735
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4406315951517480307}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3299316360080635000}
m_RootOrder: 3
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: 73.30005, y: -0.000022888}
m_SizeDelta: {x: 933.4, y: 198}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8762750754796979343
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4406315951517480307}
m_CullTransparentMesh: 0
--- !u!114 &758672339545280508
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4406315951517480307}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.50980395, g: 0.50980395, b: 0.61960787, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 50
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u8BF7\u524D\u5F80\u7F16\u961F\u754C\u9762\u8BBE\u7F6E\u4F5C\u6218\u795E\u5C06\uFF01"
LanguageIndex: 0
--- !u!1 &4462448620909060118
GameObject:
m_ObjectHideFlags: 0
@ -59459,7 +59539,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
@ -104581,7 +104661,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &3299316360080635000
RectTransform:
m_ObjectHideFlags: 0
@ -104596,6 +104676,7 @@ RectTransform:
- {fileID: 6959223419321465460}
- {fileID: 2745889260310999574}
- {fileID: 5970967723695097414}
- {fileID: 1895834760144212735}
m_Father: {fileID: 116484329638739653}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

View File

@ -143,13 +143,18 @@ function this.RequestBlood(func)
end
function this.EnterMap()
-- 进入地图编队,重新赋值一遍
EndLessMapManager.RrefreshFormation()
CarbonManager.difficulty = CARBON_TYPE.ENDLESS
--UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.CARBON, MapManager.curMapId)
if EndLessMapManager.CheckFormationIsEmpty() then
local serData = ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.ENDLESS)
if not PlayerPrefs.HasKey("WuJin"..PlayerManager.uid) then
PlayerPrefs.SetInt("WuJin"..PlayerManager.uid ,0)
end
local note = PlayerPrefs.GetInt("WuJin"..PlayerManager.uid)
LogGreen("note:"..note.." serData.endTime:"..serData.endTime)
if serData.endTime ~= note then
PlayerPrefs.SetInt("WuJin"..PlayerManager.uid,serData.endTime)
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.CARBON, MapManager.curMapId)
else
else
MapManager.curMapId = EndLessMapManager.openMapId
MapManager.curCarbonType = CarBonTypeId.ENDLESS
NetManager.MapInfoRequest(MapManager.curCarbonType, function()

View File

@ -253,10 +253,6 @@ function this:OnShow()
end
function this:OnClose()
if this.curFormationIndex == FormationTypeDef.FORMATION_ENDLESS_MAP then
LogGreen("EndLessMapManager.teamInfo:"..#EndLessMapManager.formation)
FormationManager.formationList[FormationTypeDef.FORMATION_ENDLESS_MAP].teamHeroInfos = EndLessMapManager.formation
end
tempPowerNum = 0
this.formationPower = 0
oldPowerNum = 0

View File

@ -63,20 +63,20 @@ end
--编队了i去掉死亡的英雄
function this.RrefreshFormation()
if CarbonManager.difficulty ~= CARBON_TYPE.ENDLESS then return end
local tempList = {}
local curTeam = EndLessMapManager.formation
-- if CarbonManager.difficulty ~= CARBON_TYPE.ENDLESS then return end
-- local tempList = {}
-- local curTeam = EndLessMapManager.formation
for i = 1, #curTeam do
local roleData = curTeam[i]
-- 如果队员没死翘翘了
local curRoleHp = EndLessMapManager.GetHeroLeftBlood(roleData.heroId)
if curRoleHp > 0 then
-- 编队界面数据重组
table.insert(tempList, roleData)
end
end
FormationManager.formationList[FormationTypeDef.FORMATION_ENDLESS_MAP].teamHeroInfos = tempList
-- for i = 1, #curTeam do
-- local roleData = curTeam[i]
-- -- 如果队员没死翘翘了
-- local curRoleHp = EndLessMapManager.GetHeroLeftBlood(roleData.heroId)
-- if curRoleHp > 0 then
-- -- 编队界面数据重组
-- table.insert(tempList, roleData)
-- end
-- end
-- FormationManager.formationList[FormationTypeDef.FORMATION_ENDLESS_MAP].teamHeroInfos = tempList
end
-- 进入地图

View File

@ -13,8 +13,6 @@ local endlessTreasure = ConfigManager.GetConfig(ConfigName.endlessTreasure)
this.limiteLevel = 0
function this.Initialize()
this.isCanNote = false -- 是否进入可标记状态
this.PointNoteDataList = {} -- 标记列表
this.hungery = false -- 没有行动力了
this.leftEnergy = 0 -- 剩余行动力
this.totalEnergy = 0 -- 总行动力
@ -37,6 +35,7 @@ function this.Initialize()
this.openedFormat = false
this.isSkipFight = 1 -- 服务器记录的是否跳过战斗
this.EndLessRoleDead = false -- 无尽副本角色进入死亡状态,走一步重置
this.shiQiValue = endlessMorale[1].Exp[1]
this.scoreValueId = endlessTreasure[1].Integral[1][1]
this.InitMissionData()
@ -77,34 +76,6 @@ function this.UpDateTeamMaxHp(info)
end)
end
-- 解析标记点的数据
function this.InitMapNoteData(signs)
LogPink("signs是"..signs)
-- 不是无尽副本,直接返回
if CarbonManager.difficulty ~= CARBON_TYPE.ENDLESS then return end
-- 初始化
for i, v in ConfigPairs (endLessConfig) do
this.PointNoteDataList[v.Id] = {}
end
if #signs > 0 then
for i = 1, #signs do
local data = {}
data.notePos = signs[i].cellId
data.noteInfo = signs[i].info
data.mapId = signs[i].mapId
--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)
--Log("需要刷新点的数量是 == " .. #refreshInfo )
this.freshPointData = {}
@ -137,48 +108,48 @@ end
-- =============================================================================================
-- ==================== 地图标记 ===============================================================
-- 无尽副本是否进入了可标记状态
function this.IsCanNoteState()
local canNote = false
if CarbonManager.difficulty == CARBON_TYPE.ENDLESS then
if this.isCanNote then
canNote = true
end
end
return canNote
end
-- function this.IsCanNoteState()
-- local canNote = false
-- if CarbonManager.difficulty == CARBON_TYPE.ENDLESS then
-- if this.isCanNote then
-- canNote = true
-- end
-- end
-- return canNote
-- end
-- 进入标记状态点击后保存点击选中的坐标值
function this.SetNotePos(u, v)
local selectedPos = Map_UV2Pos(u, v)
-- 没有标记过打开标记面板
local panelType = 1
panelType = this.IsPointNote(selectedPos) and 2 or 1
UIManager.OpenPanel(UIName.MapNotePopup, selectedPos, panelType)
end
-- -- 进入标记状态点击后保存点击选中的坐标值
-- function this.SetNotePos(u, v)
-- local selectedPos = Map_UV2Pos(u, v)
-- -- 没有标记过打开标记面板
-- local panelType = 1
-- panelType = this.IsPointNote(selectedPos) and 2 or 1
-- UIManager.OpenPanel(UIName.MapNotePopup, selectedPos, panelType)
-- end
-- 判断某一个点是否已经被标记
function this.IsPointNote(pos)
local isNote = false
if not this.PointNoteDataList[MapManager.curMapId][pos] or this.PointNoteDataList[MapManager.curMapId][pos].notePos == 0 then
isNote = false
else
isNote = true
end
return isNote
end
-- -- 判断某一个点是否已经被标记
-- function this.IsPointNote(pos)
-- local isNote = false
-- if not this.PointNoteDataList[MapManager.curMapId][pos] or this.PointNoteDataList[MapManager.curMapId][pos].notePos == 0 then
-- isNote = false
-- else
-- isNote = true
-- end
-- return isNote
-- end
-- 删除一个已经标记的点, 需要删除的点必定存在,不然判断方法就完蛋了
function this.DeleteNotePoint(pos, func)
local noteData = this.PointNoteDataList[MapManager.curMapId][pos]
local deletePos = pos
local mapId = MapManager.curMapId
local deleteInfo = noteData.noteInfo
local deteType = 2
-- -- 删除一个已经标记的点, 需要删除的点必定存在,不然判断方法就完蛋了
-- function this.DeleteNotePoint(pos, func)
-- local noteData = this.PointNoteDataList[MapManager.curMapId][pos]
-- local deletePos = pos
-- local mapId = MapManager.curMapId
-- local deleteInfo = noteData.noteInfo
-- local deteType = 2
NetManager.RequestNotePoint(mapId, deletePos, deleteInfo, deteType, function ()
if func then func() end
end)
end
-- NetManager.RequestNotePoint(mapId, deletePos, deleteInfo, deteType, function ()
-- if func then func() end
-- end)
-- end
-- ===========================================================================================
-- =================== 消耗行动力 ===================================================
@ -296,7 +267,6 @@ end
function this.InitFormation()
this.RrefreshFormation()
this.formation = FormationManager.formationList[FormationTypeDef.FORMATION_ENDLESS_MAP].teamHeroInfos
end
function this.InitSingleEndlessHero(_msgHeroData)
@ -658,17 +628,17 @@ function this.IsMapTeamAlive()
end
end
--刷新英雄,去掉使用的自己的英雄
--刷新英雄,去掉使用的自己的英雄和死了的英雄
function this.RrefreshFormation()
local tempList = {}
local curFormation = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_ENDLESS_MAP)
LogGreen("#curFormation.teamHeroInfos:"..#curFormation.teamHeroInfos)
for k,v in pairs(curFormation.teamHeroInfos) do
if EndLessMapManager.GetSingleCanUseHeroData(v.heroId) then
if EndLessMapManager.GetSingleCanUseHeroData(v.heroId) and (not this.allHeroBlood[v.heroId] or this.allHeroBlood[v.heroId].curHp > 0) then
table.insert(tempList,v)
end
end
FormationManager.formationList[FormationTypeDef.FORMATION_ENDLESS_MAP].teamHeroInfos = tempList
this.formation = FormationManager.formationList[FormationTypeDef.FORMATION_ENDLESS_MAP].teamHeroInfos
end
function this.CheckFormationIsEmpty()

View File

@ -530,6 +530,7 @@ function this.MapBattleExecute(monsterGroupId, optionid, callBack)
NetManager.MapFightInfoRequest(function (msg)--QuickFightRequest
local fightData = BattleManager.GetBattleServerData(msg)
local triggerCallBack
LogGreen("进入战斗----------------------------------------------------------------------------")
UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.MAP_FIGHT, function (result)
triggerCallBack = function (panelType, panel)
if panelType == UIName.MapPanel then --监听到MapPanel重新打开再抛对应事件否则接收不到

View File

@ -80,6 +80,7 @@ function EndLessMapView:InitComponent(gameObject, mapPanel)
this.bufflist = Util.GetGameObject(this.centerDown,"bufflist")
this.selectHero = Util.GetGameObject(this.centerDown,"selectHero")
this.selectHeroTip = Util.GetGameObject(this.selectHero,"tip")
this.selectHeroTip1 = Util.GetGameObject(this.selectHero,"tip1")
this.selectPre = Util.GetGameObject(this.selectHero,"pre")
this.selectHeroGrid = Util.GetGameObject(this.selectHero,"grid")
this.enemyInfo = Util.GetGameObject(this.centerDown,"enemyInfo")
@ -283,9 +284,9 @@ function EndLessMapView:OnOpen()
this:RefreshEnergyShow()
Util.GetGameObject(MapPanel.gameObject, "centerDown/selectHero"):SetActive(false)
this.helpBtn:SetActive(false)
-- 检测引导
GuideManager.CheckCarbonGuild(CARBON_TYPE.ENDLESS)
end
function EndLessMapView:OnShow()
@ -316,6 +317,7 @@ function EndLessMapView:OnShow()
this:ShowCountTime()
this:RefreshTargetRoote()
NetManager.RequestAllHeroHp(function ()
EndLessMapManager.RrefreshFormation()
this:ShowHeroData()
end)
end
@ -331,6 +333,11 @@ function EndLessMapView:ShowHeroData()
this.heroList[k].go.gameObject:SetActive(false)
end
end
if not curFormation or #curFormation < 1 then
this.selectHeroTip1.gameObject:SetActive(true)
return
end
this.selectHeroTip1.gameObject:SetActive(false)
for i, v in ipairs(curFormation) do
if not this.heroList[i] then
this.heroList[i] = {}
@ -483,24 +490,24 @@ function EndLessMapView:SetTipShow()
end
function EndLessMapView:InitBoolState()
EndLessMapManager.isCanNote = false
--EndLessMapManager.isCanNote = false
EndLessMapManager.justEnterMap = true
EndLessMapManager.isReset = false
end
-- ===================================================
-- ========= 各种按键操作的设置 =========================
-- 标记设置
function EndLessMapView:SetNoteShow()
-- 进入标记状态
EndLessMapManager.isCanNote = not EndLessMapManager.isCanNote
local canNote = EndLessMapManager.isCanNote
MapPanel.BtnBack:SetActive(not canNote)
this.btnReset:SetActive(not canNote)
this.btnFormat:SetActive(not canNote)
this.btnSet:SetActive(not canNote)
ctrlView.IsForbitLongClick(canNote)
end
-- -- 标记设置
-- function EndLessMapView:SetNoteShow()
-- -- 进入标记状态
-- --EndLessMapManager.isCanNote = not EndLessMapManager.isCanNote
-- -- local canNote = EndLessMapManager.isCanNote
-- -- MapPanel.BtnBack:SetActive(not canNote)
-- -- this.btnReset:SetActive(not canNote)
-- -- this.btnFormat:SetActive(not canNote)
-- -- this.btnSet:SetActive(not canNote)
-- -- ctrlView.IsForbitLongClick(canNote)
-- end
-- 按钮可点击的判断
function EndLessMapView:CanClick()
@ -583,9 +590,9 @@ function EndLessMapView:RefreshEnergyValue(isInit, costType)
EndLessMapManager.leftEnergy = curEnergy
EndLessMapManager.isHungery()
this:RefreshEnergyShow()
MapManager.MapUpdateEvent(-1000, function ()
this:ShowCountTime()
end)
-- MapManager.MapUpdateEvent(-1000, function ()
-- this:ShowCountTime()
-- end)
end
-- 刷新行动力组件显示

View File

@ -168,10 +168,10 @@ function this.WalkLimit(showTip)
if MapManager.isRemoving then Log(Language[11283]) value = 4 end
end
-- 加入进入标记状态
if EndLessMapManager.IsCanNoteState() then
value = 5
end
-- -- 加入进入标记状态
-- if EndLessMapManager.IsCanNoteState() then
-- value = 5
-- end
if EndLessMapManager.roleIsHungery() then
if showTip then
@ -218,24 +218,24 @@ function this.OnClickTile(u, v)
--- 判断点击位置是否超出地图区域
local data = TileMapView.GetTileData(u, v)
if not data then
if EndLessMapManager.IsCanNoteState() then
PopupTipPanel.ShowTip(Language[11285])
end
-- if EndLessMapManager.IsCanNoteState() then
-- PopupTipPanel.ShowTip(Language[11285])
-- end
return
end
-- 无尽副本进入地图标记状态
-- =====================================
if EndLessMapManager.IsCanNoteState() then
if not funcCanPass(data) then
PopupTipPanel.ShowTip(Language[11286])
return
end
-- if EndLessMapManager.IsCanNoteState() then
-- if not funcCanPass(data) then
-- PopupTipPanel.ShowTip(Language[11286])
-- return
-- end
Log(string.format("坐标位置(%s, %s)", u, v))
EndLessMapManager.SetNotePos(u, v)
return
end
-- Log(string.format("坐标位置(%s, %s)", u, v))
-- EndLessMapManager.SetNotePos(u, v)
-- return
-- end
if EndLessMapManager.roleIsHungery() then
PopupTipPanel.ShowTip(Language[11284])
@ -246,21 +246,27 @@ function this.OnClickTile(u, v)
-- 无尽副本进图死亡状态
if CarbonManager.difficulty == CARBON_TYPE.ENDLESS then
if EndLessMapManager.EndLessRoleDead then
-- 重登时如果都是死的,上面的判断就可以,如果还有活着的,肯定在队伍中
if EndLessMapManager.IsAllDead() then
PopupTipPanel.ShowTip(Language[11287])
return
end
if not MapManager.endlessEnter then
if not EndLessMapManager.IsMapTeamAlive() then
PopupTipPanel.ShowTip(Language[11288])
return
end
end
local curFomation = EndLessMapManager.formation
if not curFomation or #curFomation < 1 then
PopupTipPanel.ShowTip("请前往编队界面设置作战神将!")
MapManager.endlessEnter = false
return
end
-- if EndLessMapManager.EndLessRoleDead then
-- PopupTipPanel.ShowTip(Language[11287])
-- -- 重登时如果都是死的,上面的判断就可以,如果还有活着的,肯定在队伍中
-- if EndLessMapManager.IsAllDead() then
-- PopupTipPanel.ShowTip(Language[11287])
-- return
-- end
-- if not MapManager.endlessEnter then
-- if not EndLessMapManager.IsMapTeamAlive() then
-- PopupTipPanel.ShowTip(Language[11288])
-- return
-- end
-- end
-- MapManager.endlessEnter = false
-- end
end
-- =====================================
--- 当栈中有逻辑,则点击可以打断栈操作,并清空当前栈

View File

@ -38,13 +38,13 @@ function MapNotePopup:BindEvent()
self:ClosePanel()
end)
Util.AddClick(this.btnConfirmDelete, function ()
EndLessMapManager.DeleteNotePoint(this.notePos, function ()
self:ClosePanel()
Game.GlobalEvent:DispatchEvent(GameEvent.Map.OnRemoveNotePoint, this.notePos)
Log("删除点" .. this.notePos .. "成功!")
end)
end)
-- Util.AddClick(this.btnConfirmDelete, function ()
-- EndLessMapManager.DeleteNotePoint(this.notePos, function ()
-- self:ClosePanel()
-- Game.GlobalEvent:DispatchEvent(GameEvent.Map.OnRemoveNotePoint, this.notePos)
-- Log("删除点" .. this.notePos .. "成功!")
-- end)
-- end)
end
--添加事件监听(用于子类重写)