Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
4160f6d2a5
|
|
@ -61,6 +61,11 @@ function GuildCarDelayLootRecordPopup:OnShow()
|
|||
table.insert(allLootRecordData,v)
|
||||
end
|
||||
|
||||
table.sort(allLootRecordData, function(a,b)
|
||||
if (a and #a > 0) and (b and #b > 0) then
|
||||
return a[1].time > b[1].time
|
||||
end
|
||||
end)
|
||||
for i = 1, #recordPerList do
|
||||
if allLootRecordData[i] and #allLootRecordData[i] > 0 then
|
||||
Util.GetGameObject(recordPerList[i], "titleImage/titleImage/titleText"):GetComponent("Text").text = this.TimeStampToDateString(allLootRecordData[i][1].time,2)
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ function this.SetLive2dState(setData, isNeedLoad, resPath, live2dRoot, effectRoo
|
|||
position = Vector3(setData.Position[1], setData.Position[2], 0)
|
||||
|
||||
if resPath == this.bitchRes then
|
||||
position = Vector3.New(0, -200, 0)
|
||||
position = Vector3.New(0, -250, 0)
|
||||
scale = 0.5
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue