Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
ZhangBiao 2021-10-25 18:40:33 +08:00
commit f51c80b277
4 changed files with 18 additions and 10 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

View File

@ -36,8 +36,8 @@ RectTransform:
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: -0.00000095367, y: -377}
m_SizeDelta: {x: 847.3, y: 177.8}
m_AnchoredPosition: {x: -0.00000095367, y: -388.9}
m_SizeDelta: {x: 847.3, y: 201.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7368018991282595720
CanvasRenderer:
@ -449,8 +449,8 @@ RectTransform:
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: -2, y: 36.300003}
m_SizeDelta: {x: 1076, y: 960.7}
m_AnchoredPosition: {x: -2, y: 17}
m_SizeDelta: {x: 1076, y: 999.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5267261137994259565
CanvasRenderer:
@ -757,7 +757,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -0.000015258789}
m_AnchoredPosition: {x: 0, y: 0.000022888184}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &5343069358979546458
@ -794,8 +794,8 @@ MonoBehaviour:
m_ChildAlignment: 4
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 135, y: 135}
m_Spacing: {x: 50, y: 21.75}
m_CellSize: {x: 135, y: 150}
m_Spacing: {x: 50, y: 45}
m_Constraint: 0
m_ConstraintCount: 2
--- !u!1 &2755785382488797040

View File

@ -195,7 +195,7 @@ function this.ShowDayData(_curDayIndex)
--组当前所有任务的表数据
local curDayAllTaskConFigData = {}
for key, configInfo in ConfigPairs(JourneyWithWind) do
if configInfo.DayNum == curDayIndex then
if activityData.activityId == configInfo.ActivityId and configInfo.DayNum == curDayIndex then
table.insert(curDayAllTaskConFigData,configInfo)
end
end

View File

@ -68,7 +68,7 @@ function WorldArenaUpRewardPanel:OnOpen(data)
titleLive.transform:SetParent(this.rankImg.transform)
titleLive.transform.localPosition=Vector3.New(0,-600,0)
titleLive.transform.localScale =Vector3.New(1,1,1)
AddParticleSortLayer(titleLive,self.sortingOrder)
SetParticleSortLayer(titleLive,self.sortingOrder)
if not rankData then
return
end
@ -113,7 +113,7 @@ function this.SetStarShow(star,grade,layer)
titleLive.transform.localPosition=Vector3.New(0,-600,0)
titleLive.transform.localScale =Vector3.New(1,1,1)
end
AddParticleSortLayer(titleLive,layer)
SetParticleSortLayer(titleLive,layer)
end
this.rankName.text=rankData.RankName
end
@ -175,6 +175,9 @@ end
function WorldArenaUpRewardPanel:OnSortingOrderChange()
layer=self.sortingOrder
if titleLive then
SetParticleSortLayer(titleLive,self.sortingOrder)
end
end
--滚动条数
@ -253,6 +256,11 @@ function this:OnClose()
this.TimeCounter:Stop()
this.TimeCounter = nil
end
if titleLive then
destroy(titleLive)
titleLive=nil
end
end