From a46ee1c52c7c426fbd44375c988177947591393a Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 7 Sep 2020 15:26:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=95=E5=AF=BC=E6=80=A5?= =?UTF-8?q?=E9=80=9F=E6=8E=A2=E7=B4=A2=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Fight/FightEndLvUpPanel.prefab | 24 +++++++++---------- .../~Lua/Framework/Framework.lua | 6 ++--- .../~Lua/Modules/Guide/GuidePanel.lua | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Fight/FightEndLvUpPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Fight/FightEndLvUpPanel.prefab index 7863cb5d2b..9052039925 100644 --- a/Assets/ManagedResources/Prefabs/UI/Fight/FightEndLvUpPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Fight/FightEndLvUpPanel.prefab @@ -267,7 +267,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 441, y: 0.000030517578} + m_AnchoredPosition: {x: 441, y: 0.000015258789} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &764029605 @@ -725,7 +725,6 @@ RectTransform: - {fileID: 224502265043366100} - {fileID: 224416896721062188} - {fileID: 224266054869816714} - - {fileID: 224829722751050762} - {fileID: 224190317783584220} - {fileID: 224143234364797586} - {fileID: 5583254372299283253} @@ -1018,7 +1017,7 @@ RectTransform: m_Children: - {fileID: 224612920144669484} m_Father: {fileID: 224665127863931030} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1166,7 +1165,7 @@ RectTransform: m_LocalScale: {x: 0.58, y: 0.58, z: 0.58} m_Children: [] m_Father: {fileID: 224665127863931030} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1322,12 +1321,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 224665127863931030} - m_RootOrder: 3 + m_Father: {fileID: 2609889525416484931} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 2, y: -504.99997} + m_AnchoredPosition: {x: 1.1801529, y: 83.4} m_SizeDelta: {x: 348, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222303224665697482 @@ -1432,7 +1431,7 @@ RectTransform: m_Children: - {fileID: 224311569589795904} m_Father: {fileID: 224665127863931030} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -11089,7 +11088,7 @@ RectTransform: - {fileID: 471105427101296712} - {fileID: 471503146357997718} m_Father: {fileID: 224665127863931030} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -67972,7 +67971,8 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 224829722751050762} m_Father: {fileID: 224377073835667412} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -68160,7 +68160,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 441, y: 0.000030517578} + m_AnchoredPosition: {x: 441, y: 0.000061035156} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3234776055937844155 @@ -82675,7 +82675,7 @@ RectTransform: - {fileID: 8128104725208682281} - {fileID: 3587127174153274449} m_Father: {fileID: 224665127863931030} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} diff --git a/Assets/ManagedResources/~Lua/Framework/Framework.lua b/Assets/ManagedResources/~Lua/Framework/Framework.lua index a5b4e5de58..408e10f8bd 100644 --- a/Assets/ManagedResources/~Lua/Framework/Framework.lua +++ b/Assets/ManagedResources/~Lua/Framework/Framework.lua @@ -52,9 +52,9 @@ local update = function() -- local ft = UIManager.width/UIManager.height -- local rw = ft * 1920 - Log(UIManager.UIWidth.."|"..UIManager.UIHeight) - Log(UIManager.width.."|"..UIManager.height) - Log(Input.mousePosition.x.."|"..Input.mousePosition.y) + -- Log(UIManager.UIWidth.."|"..UIManager.UIHeight) + -- Log(UIManager.width.."|"..UIManager.height) + -- Log(Input.mousePosition.x.."|"..Input.mousePosition.y) local wf = UIManager.UIWidth/1080 local hf = UIManager.UIHeight/1920 diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua index c957560fdb..4de3c9dbd2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua @@ -140,9 +140,9 @@ function this.ExecuteBehavior(beType, beArgs) if curGuideId == curId then this.NextGuide() end - this.button:GetComponent("Button").onClick:RemoveAllListeners() - Util.AddClick(this.button, this.NextGuide) end) + this.button:GetComponent("Button").onClick:RemoveAllListeners() + Util.AddClick(this.button, this.NextGuide) end) if UIManager.IsOpen(UIName.MainPanel) and string.find(btn.transform.parent.name, "layer") ~= nil then --主界面的ui按钮位置可能会超框,所以做位移处理 for k, v in pairs(MainPanel.operateIcon) do