Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
2b81c437e8
|
@ -134,7 +134,7 @@ end
|
||||||
function this.HardStageReportRequset(_fightLevelData, callBack)
|
function this.HardStageReportRequset(_fightLevelData, callBack)
|
||||||
NetManager.HardStageReportRequset( _fightLevelData.nodeId,function (msg)--FIGHT_LEVEL _fightLevelData.config.Chapter,
|
NetManager.HardStageReportRequset( _fightLevelData.nodeId,function (msg)--FIGHT_LEVEL _fightLevelData.config.Chapter,
|
||||||
if msg.player and #msg.player > 0 then
|
if msg.player and #msg.player > 0 then
|
||||||
UIManager.OpenPanel(UIName.FightLevelSingleLevelInfoPopup,FIGHTLEVEL_POPUP_TYPE.BackBattle,msg.player)
|
UIManager.OpenPanel(UIName.FightLevelSingleLevelInfoPopup,FIGHTLEVEL_POPUP_TYPE.BackBattle,msg.player,_fightLevelData)
|
||||||
else
|
else
|
||||||
PopupTipPanel.ShowTip("尚无符合条件的回放!")
|
PopupTipPanel.ShowTip("尚无符合条件的回放!")
|
||||||
end
|
end
|
||||||
|
|
|
@ -200,6 +200,8 @@ function this.SetlevelBox(_rewardBoxDatas)
|
||||||
end)
|
end)
|
||||||
else
|
else
|
||||||
Util.GetGameObject(boxList[i], "redPoint"):SetActive(false)
|
Util.GetGameObject(boxList[i], "redPoint"):SetActive(false)
|
||||||
|
Util.AddOnceClick(boxList[i], function()
|
||||||
|
end)
|
||||||
end
|
end
|
||||||
elseif _rewardBoxDatas[i].state == 1 then
|
elseif _rewardBoxDatas[i].state == 1 then
|
||||||
Util.GetGameObject(boxList[i], "getFinish"):SetActive(true)
|
Util.GetGameObject(boxList[i], "getFinish"):SetActive(true)
|
||||||
|
|
|
@ -113,7 +113,7 @@ function this:ShoeReward()
|
||||||
local itemParent = Util.GetGameObject(_go, "parent")
|
local itemParent = Util.GetGameObject(_go, "parent")
|
||||||
if fightLevelData.state == 0 then--副关卡未通过
|
if fightLevelData.state == 0 then--副关卡未通过
|
||||||
Util.GetGameObject(_go, "getImage"):SetActive(false)
|
Util.GetGameObject(_go, "getImage"):SetActive(false)
|
||||||
elseif fightLevelData.state == 0 then--副关卡已通过
|
elseif fightLevelData.state == 1 then--副关卡已通过
|
||||||
Util.GetGameObject(_go, "getImage"):SetActive(true)
|
Util.GetGameObject(_go, "getImage"):SetActive(true)
|
||||||
end
|
end
|
||||||
if not this.NoviceItemList[_go] then
|
if not this.NoviceItemList[_go] then
|
||||||
|
|
|
@ -8,6 +8,7 @@ local fun
|
||||||
local data = {}
|
local data = {}
|
||||||
local prbGoGrid = {}
|
local prbGoGrid = {}
|
||||||
local backFun
|
local backFun
|
||||||
|
local fightLevelData = {}
|
||||||
this.playerScrollHead = {}--背景前三头像
|
this.playerScrollHead = {}--背景前三头像
|
||||||
function this:InitComponent(gameObject)
|
function this:InitComponent(gameObject)
|
||||||
this.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text")
|
this.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text")
|
||||||
|
@ -39,7 +40,8 @@ function this:OnShow(_parent,...)
|
||||||
--不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参
|
--不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参
|
||||||
local args = {...}
|
local args = {...}
|
||||||
data = args[1]
|
data = args[1]
|
||||||
backFun = args[2]
|
fightLevelData = args[2]
|
||||||
|
backFun = args[3]
|
||||||
this.titleText.text="战斗回放"
|
this.titleText.text="战斗回放"
|
||||||
for i = 1, 2 do
|
for i = 1, 2 do
|
||||||
prbGoGrid[i]:SetActive(false)
|
prbGoGrid[i]:SetActive(false)
|
||||||
|
@ -68,9 +70,17 @@ function this.SetInfo(root,data,index)
|
||||||
Util.GetGameObject(root,"name"):GetComponent("Text").text = data.userName
|
Util.GetGameObject(root,"name"):GetComponent("Text").text = data.userName
|
||||||
Util.GetGameObject(root,"warPower/Text"):GetComponent("Text").text = data.power
|
Util.GetGameObject(root,"warPower/Text"):GetComponent("Text").text = data.power
|
||||||
if data.type == 1 then
|
if data.type == 1 then
|
||||||
Util.GetGameObject(root,"ClickBtn/tip"):GetComponent("Text").text = "首次三星通关"
|
if fightLevelData.config.StageType == FIGHTLEVEL_STAGETYPE.MainLevel then
|
||||||
|
Util.GetGameObject(root,"ClickBtn/tip"):GetComponent("Text").text = "首次三星通关"
|
||||||
|
elseif fightLevelData.config.StageType == 3 then
|
||||||
|
Util.GetGameObject(root,"ClickBtn/tip"):GetComponent("Text").text = "首次通关"
|
||||||
|
end
|
||||||
elseif data.type == 2 then
|
elseif data.type == 2 then
|
||||||
Util.GetGameObject(root,"ClickBtn/tip"):GetComponent("Text").text = "最低战力三星通关"
|
if fightLevelData.config.StageType == FIGHTLEVEL_STAGETYPE.MainLevel then
|
||||||
|
Util.GetGameObject(root,"ClickBtn/tip"):GetComponent("Text").text = "最低战力三星通关"
|
||||||
|
elseif fightLevelData.config.StageType == 3 then
|
||||||
|
Util.GetGameObject(root,"ClickBtn/tip"):GetComponent("Text").text = "最低战力通关"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
Util.AddOnceClick(Util.GetGameObject(root,"ClickBtn"), function()
|
Util.AddOnceClick(Util.GetGameObject(root,"ClickBtn"), function()
|
||||||
local _fightData = BattleManager.GetBattleServerData(data,0)
|
local _fightData = BattleManager.GetBattleServerData(data,0)
|
||||||
|
|
Loading…
Reference in New Issue