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

dev_chengFeng
gaoxin 2020-07-21 14:09:52 +08:00
commit 528243e0ee
11 changed files with 12 additions and 15 deletions

View File

@ -55,7 +55,7 @@ function this:InitComponent()
-- 试炼副本相关组件
this.leftUp = Util.GetGameObject(self.gameObject, "leftUp")
this.leftRelife = Util.GetGameObject(self.gameObject, "leftDown/leftLifeRoot")
-- this.leftRelife = Util.GetGameObject(self.gameObject, "leftDown/leftLifeRoot")
this.centerDonwn = Util.GetGameObject(self.gameObject, "centerDown")
missionView.InitComponent(self.gameObject, this)
@ -297,7 +297,7 @@ end
-- 根据副本的类型显示组件
function this.InitCompShow(type)
this.leftUp:SetActive(type == 2)
this.leftRelife:SetActive(type == 2)
-- this.leftRelife:SetActive(type == 2)
this.centerDonwn:SetActive(true)
end
@ -497,7 +497,6 @@ function this.OnMapOut(nextMapId, outType)
distMapId = nextMapId
end
LogPink("MapTrialManager.curTowerLevel"..MapTrialManager.curTowerLevel)
NetManager.MapOutRequest(outType, function (msg)
if nextMapId == 100 or nextMapId == 0 then
this.BackHome()

View File

@ -76,7 +76,6 @@ end
-- 进入下一层
function this.GoNextLevel()
local curMapId = trailConfig[MapTrialManager.curTowerLevel + 1].MapId
LogGreen("下一普通层的ID是"..curMapId)
this.isChangeLevel = true
Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out, curMapId, 1)
this.bossType = 0
@ -116,7 +115,6 @@ end
-- 黄四郎:好
function this.GoSurprisedLevel()
local mapId = this.GetSurprisedLevelMapId()
LogGreen("下一惊喜层的ID是"..mapId)
this.isChangeLevel = true
Game.GlobalEvent:DispatchEvent(GameEvent.Map.Out, mapId, 1)
this.bossType = 0
@ -127,7 +125,6 @@ function this.GetSurprisedLevelMapId()
if MapTrialManager.curTowerLevel < 10000 then
MapTrialManager.curTowerLevel = MapTrialManager.curTowerLevel + 10000
end
LogRed("MapTrialManager.curTowerLevel"..MapTrialManager.curTowerLevel)
local mId = 0
for mapId, _ in ConfigPairs(trailConfig) do
if mapId >= MapTrialManager.curTowerLevel then
@ -135,7 +132,6 @@ function this.GetSurprisedLevelMapId()
break
end
end
LogPink("trailConfig[mId].MapId"..trailConfig[mId].MapId)
return trailConfig[mId].MapId
end

View File

@ -21,8 +21,8 @@ function this.InitComponent(gameObject, mapPanel)
--this.btnSet = Util.GetGameObject(gameObject, "rightUp/btnSetting")
-- 显示任务时间
this.timeText = Util.GetGameObject(gameObject, "leftDown/timeRoot/Time"):GetComponent("Text")
this.timeRoot = Util.GetGameObject(gameObject, "leftDown/timeRoot")
-- this.timeText = Util.GetGameObject(gameObject, "leftDown/timeRoot/Time"):GetComponent("Text")
-- this.timeRoot = Util.GetGameObject(gameObject, "leftDown/timeRoot")
-- 任务展开
this.btnExpand = Util.GetGameObject(gameObject, "TargetRoot/btnExpand")
this.imgUp = Util.GetGameObject(gameObject, "TargetRoot/btnExpand/imgUp")
@ -114,7 +114,7 @@ end
-- 初始化任务组件显示
function this.SetTargetShow()
-- this.targetRoot:SetActive(CarbonManager.difficulty ~= 4)
this.timeRoot:SetActive(false)
-- this.timeRoot:SetActive(false)
end
-- 设置副本任务时间
@ -125,7 +125,7 @@ function this.OnMissionTimeChange(time)
if CarbonManager.difficulty ~= 2 then
this.NormalShowTime(time)
end
this.timeRoot:SetActive(true)
-- this.timeRoot:SetActive(true)
end
end
@ -137,7 +137,7 @@ function this.InitMissionState()
-- 副本任务初始化
if isOpen == false then
this.DragCtrl:SetActive(false)
this.timeText.text = ""
-- this.timeText.text = ""
-- 初始化任务显示
this.InitComp()
Log(Language[11306])
@ -221,10 +221,10 @@ function this.InitCarbonData()
if MapManager.curMapId == 100 then --序章特殊处理,默认不能跳过战斗
CarbonManager.isPassFight = false
--this.btnSet:SetActive(false)
this.timeText.gameObject:SetActive(false)
-- this.timeText.gameObject:SetActive(false)
else
CarbonManager.isPassFight = true
this.timeText.gameObject:SetActive(true)
-- this.timeText.gameObject:SetActive(true)
end
end
@ -435,7 +435,7 @@ function this.NormalShowTime(time)
newTime = time
end
this.timeText.text = this.FormatTime(newTime)
-- this.timeText.text = this.FormatTime(newTime)
local isTimeToFuckOut = false
if time >= data.MapTime then

View File

@ -6,6 +6,8 @@
* @Copyright Copyright (c) 2019, MagicianJoker
--]]
--去看SevenDayCarnivalPanelV2吧应该不用了
local SevenDayCarnivalHalfPricePage = require("Modules/SevenDayCarnival/SevenDayCarnivalHalfPricePage")
local SevenDayCarnivalTaskItem = require("Modules/SevenDayCarnival/SevenDayCarnivalTaskItem")