Merge branch 'china/dev' into 0活动开发聚集地/特惠神装

dev_chengFeng
ZhangBiao 2021-07-01 16:36:16 +08:00
commit d2a10051e5
2 changed files with 8 additions and 0 deletions

View File

@ -155,6 +155,7 @@ function this.EnterMap()
local note = PlayerPrefs.GetInt("WuJin"..PlayerManager.uid) local note = PlayerPrefs.GetInt("WuJin"..PlayerManager.uid)
MapManager.curMapId = EndLessMapManager.openMapId MapManager.curMapId = EndLessMapManager.openMapId
if serData.endTime ~= note then if serData.endTime ~= note then
TaskManager.ResetEndlessMissionState()
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.CARBON, MapManager.curMapId) UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.CARBON, MapManager.curMapId)
else else
MapManager.curCarbonType = CarBonTypeId.ENDLESS MapManager.curCarbonType = CarBonTypeId.ENDLESS

View File

@ -482,4 +482,11 @@ end
function this.DelAllShowTipMissionOne() function this.DelAllShowTipMissionOne()
table.remove(allShowTipMission,1) table.remove(allShowTipMission,1)
end end
function this.ResetEndlessMissionState()
for k,v in ipairs(TypeTaskData[TaskTypeDef.wujinfuben]) do
v.progress = 0
v.state = 0
end
end
return this return this