竞技场修改
parent
0d3cbb7fea
commit
29c2f73906
|
|
@ -866,7 +866,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &8668657611625403729
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2094,7 +2094,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &3868607663952482914
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2111,10 +2111,10 @@ RectTransform:
|
|||
m_Father: {fileID: 2478093206073120517}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 510, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 458, y: -342.5}
|
||||
m_SizeDelta: {x: 510, y: 42}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &135746393268525385
|
||||
CanvasRenderer:
|
||||
|
|
|
|||
|
|
@ -129,6 +129,7 @@ function ArenaResultPopup:OnOpen(_args,_fun)
|
|||
end
|
||||
|
||||
local rScore = redInfo.deltaScore
|
||||
LogError("rscore=========================="..rScore)
|
||||
if rScore and isWin then
|
||||
redScore:SetActive(true)
|
||||
local redScoreColor = rScore >= 0 and UIColorStr.GREEN or UIColorStr.RED
|
||||
|
|
@ -142,7 +143,7 @@ function ArenaResultPopup:OnOpen(_args,_fun)
|
|||
if panelType == 0 then
|
||||
blueResult:SetActive(false)
|
||||
redResult:SetActive(false)
|
||||
bigResult.sprite = this.spLoader:LoadSprite(isWin and "UI_effect_JJC_JieSuan_ShengLi_png_zh" or "UI_effect_JJC_JieSuan_ShiBai_png_zh")
|
||||
bigResult.sprite = this.spLoader:LoadSprite(isWin and "UI_hz_zhonghe05_47" or "UI_hz_zhonghe05_21")
|
||||
bigResult:SetNativeSize()
|
||||
elseif panelType == 1 then
|
||||
blueResult:SetActive(true)
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ end
|
|||
-- 打开,重新打开时回调
|
||||
function ArenaTypePanel:OnShow()
|
||||
-- 竞技场
|
||||
|
||||
NetManager.NewArenaResetRequest()
|
||||
NetManager.GetNewArenaInfoRequest(function()
|
||||
-- NetManager.RequestArenaRankData(1, function()
|
||||
this.RefreshArenaShow()
|
||||
|
|
|
|||
|
|
@ -235,12 +235,13 @@ function ArenaView:OnOpen( sortingOrder,_parent)
|
|||
end, 1)
|
||||
this.delayRefresh:Start()
|
||||
this.RefreshRankInfo()
|
||||
NetManager.NewArenaResetRequest()
|
||||
--NetManager.NewArenaResetRequest()
|
||||
--this.RefreshReward()
|
||||
end
|
||||
|
||||
-- 0点在这个界面时刷新数据
|
||||
function this.ZeroRefresh()
|
||||
NetManager.NewArenaResetRequest()
|
||||
NetManager.GetNewArenaInfoRequest()
|
||||
end
|
||||
-- 刷新排名信息
|
||||
|
|
@ -374,6 +375,7 @@ function this.RefreshEnemyData()
|
|||
local leftTimes = ArenaManager.GetArenaChallengeTimes()
|
||||
this.freeTimes.text = string.format("%s次", math.max(leftTimes, 0))
|
||||
local EnemyList = ArenaManager.GetEnemyList()
|
||||
LogError("EnemyList================="..#EnemyList)
|
||||
table.sort(EnemyList, function(a,b) return a.score > b.score end)
|
||||
for i, node in ipairs(this.Enemys) do
|
||||
node:SetActive(false)
|
||||
|
|
|
|||
|
|
@ -44,6 +44,8 @@ function ArenaNewRankRewardPanel:InitComponent()
|
|||
this.myRankNum = Util.GetGameObject(this.myRank, "num"):GetComponent("Text")
|
||||
this.myInfo = Util.GetGameObject(this.bottom, "MyInfo")
|
||||
this.myInfoName = Util.GetGameObject(this.bottom, "MyInfo/Text"):GetComponent("Text")
|
||||
this.myInfoName2 = Util.GetGameObject(this.bottom, "MyInfo/Text (1)"):GetComponent("Text")
|
||||
this.myInfoName2.text="达到段位可获得"
|
||||
this.norank = Util.GetGameObject(this.bottom, "MyInfo/myrank")
|
||||
|
||||
this.tips = Util.GetGameObject(this.bottom, "Tips")
|
||||
|
|
@ -117,7 +119,7 @@ function ArenaNewRankRewardPanel:OnOpen(Type,myRank,_baseData)
|
|||
this.TabCtrl:Init(this.tabbox, _TabData)
|
||||
this.myRank:SetActive(false)
|
||||
this.myInfo:SetActive(true)
|
||||
this.tips:SetActive(true)
|
||||
this.tips:SetActive(false)
|
||||
this.scrollRect.transform.sizeDelta = vec[curRankType]
|
||||
this.ScrollView.transform.sizeDelta = vec[curRankType]
|
||||
this.RefreshMyInfo()
|
||||
|
|
@ -172,20 +174,19 @@ function this.RefreshMyInfo()
|
|||
break
|
||||
end
|
||||
end
|
||||
|
||||
--显示奖励
|
||||
for i = 1, #rewardList do
|
||||
if itemList2[i] then
|
||||
itemList2[i]:OnOpen(false, rewardList[i], 0.75,false,false,false,sorting)
|
||||
else
|
||||
itemList2[i] = SubUIManager.Open(SubUIConfig.ItemView, Util.GetGameObject(this.myInfo, "content").transform)
|
||||
itemList2[i]:OnOpen(false, rewardList[i], 0.75,false,false,false,sorting)
|
||||
if rewardList and #rewardList>0 and type(rewardList[1][1])~="userdata" then
|
||||
--显示奖励
|
||||
for i = 1, #rewardList do
|
||||
if itemList2[i] then
|
||||
itemList2[i]:OnOpen(false, rewardList[i], 0.75,false,false,false,sorting)
|
||||
else
|
||||
itemList2[i] = SubUIManager.Open(SubUIConfig.ItemView, Util.GetGameObject(this.myInfo, "content").transform)
|
||||
itemList2[i]:OnOpen(false, rewardList[i], 0.75,false,false,false,sorting)
|
||||
end
|
||||
itemList2[i].gameObject:SetActive(true)
|
||||
end
|
||||
itemList2[i].gameObject:SetActive(true)
|
||||
end
|
||||
|
||||
|
||||
|
||||
|
||||
end
|
||||
|
||||
function this.ShowRewardInfo()
|
||||
|
|
@ -223,7 +224,7 @@ function this.ActivityRewardSingleShow(activityRewardGo,rewardData,index)
|
|||
end
|
||||
|
||||
--LogError("rewardData.ArenaLevelReward==="..#rewardData.ArenaLevelReward)
|
||||
if rewardData.ArenaLevelReward then
|
||||
if rewardData.ArenaLevelReward and #rewardData.ArenaLevelReward>0 and type(rewardData.ArenaLevelReward[1][1])~="userdata" then
|
||||
for i = 1, #rewardData.ArenaLevelReward do
|
||||
if itemList[activityRewardGo.name][i] then
|
||||
itemList[activityRewardGo.name][i]:OnOpen(false, rewardData.ArenaLevelReward[i], 0.75,false,false,false,sorting)
|
||||
|
|
|
|||
Loading…
Reference in New Issue