From 162180894bb91043592b47786b3191e890371229 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Sat, 29 Aug 2020 15:40:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=BD=A6=E8=BF=9F=E6=8A=A2=E5=A4=BA?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=8E=92=E7=BB=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Guild/CarDelay/GuildCarDelayLootRecordPopup.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootRecordPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootRecordPopup.lua index 9a058157b4..e436c5fd12 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootRecordPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootRecordPopup.lua @@ -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) From e3ce0b2c1ba7822363f5042e46c61f11bbab7b8c Mon Sep 17 00:00:00 2001 From: liujiaqi Date: Thu, 27 Aug 2020 11:54:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B0=8F=E5=A5=B3=E5=AD=A9=E5=89=A7?= =?UTF-8?q?=E6=83=85=E4=BD=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua b/Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua index 2aba8f7bb4..1b331bc283 100644 --- a/Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua @@ -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