From 05e4a9b8de0ec901976f9ceecc7ebf4da558a170 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Wed, 5 Jun 2024 11:45:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=82=E6=9C=BA=E7=95=8C=E9=9D=A2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=E5=90=8Cbt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 72937292bf542e7acfe034003d66fe3b6cafb394) --- .../UI/Fight/FightPointPassMainPanel.prefab | 22 +++++++++---------- .../Modules/Fight/FightPointPassMainPanel.lua | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab index 1a5d26f668..f11a52a00f 100644 --- a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab @@ -132706,12 +132706,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 3829532297210306968} - m_RootOrder: 7 + m_Father: {fileID: 6461990839478086415} + m_RootOrder: 8 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: -144, y: 1044} + m_AnchoredPosition: {x: -167, y: 735} m_SizeDelta: {x: 183.07, y: 34.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7386864981625236406 @@ -132749,7 +132749,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -184886,7 +184886,7 @@ RectTransform: 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_AnchoredPosition: {x: 50, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &109213283015355470 @@ -191691,6 +191691,7 @@ RectTransform: - {fileID: 4594492938401723161} - {fileID: 6471780584234647524} - {fileID: 8473399423757764058} + - {fileID: 708783856290733406} m_Father: {fileID: 3223588515252977199} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -222151,7 +222152,6 @@ RectTransform: - {fileID: 2039730614} - {fileID: 2835335463341580670} - {fileID: 5303319522292383812} - - {fileID: 708783856290733406} m_Father: {fileID: 7718967529276036518} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -258151,11 +258151,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 5391497229806396012} m_Modifications: - - target: {fileID: 4537954547819557299, guid: 45fb9a1ded4a71146ba636b09e5dabcf, - type: 3} - propertyPath: m_Name - value: UI_Effect_MuBiaoJiangLi - objectReference: {fileID: 0} - target: {fileID: 8645003667159546895, guid: 45fb9a1ded4a71146ba636b09e5dabcf, type: 3} propertyPath: m_LocalPosition.x @@ -258261,6 +258256,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 4537954547819557299, guid: 45fb9a1ded4a71146ba636b09e5dabcf, + type: 3} + propertyPath: m_Name + value: UI_Effect_MuBiaoJiangLi + objectReference: {fileID: 0} - target: {fileID: 7667894851207529766, guid: 45fb9a1ded4a71146ba636b09e5dabcf, type: 3} propertyPath: m_IsActive diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua index 20e679e971..d4871f453f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua @@ -197,7 +197,6 @@ function FightPointPassMainPanel:InitComponent() --解锁功能 this.openFun = Util.GetGameObject(self.gameObject, "Bg/RightUpVertical/openFun") this.openFunNeedInfo = Util.GetGameObject(self.gameObject, "Bg/btnDown/btnFight/needInfo"):GetComponent("Text") - this.openTip = Util.GetGameObject(self.gameObject, "Bg/btnDown/btnFight/openTip"):GetComponent("Text") this.openFunFunInfo = Util.GetGameObject(self.gameObject, "Bg/RightUpVertical/openFun/funInfo"):GetComponent("Text") --世界等级 Util.GetGameObject(self.gameObject, "Bg/RightUpVertical/worldLv/Text"):GetComponent("Text").text = "世界等级:" @@ -281,6 +280,7 @@ function FightPointPassMainPanel:InitComponent() this.soliderPre=Util.GetGameObject(self.gameObject, "battlePanel/soliderPre") this.timeTxt=Util.GetGameObject(self.gameObject, "battlePanel/timeTxt"):GetComponent("Text") this.hpTxt=Util.GetGameObject(self.gameObject, "battlePanel/hpTxt"):GetComponent("Text") + this.openTip = Util.GetGameObject(self.gameObject, "battlePanel/openTip"):GetComponent("Text") this.floorTxt=Util.GetGameObject(self.gameObject, "battlePanel/floorTxt"):GetComponent("Text") this.bossObj=Util.GetGameObject(self.gameObject, "Bg/btnDown/bossObj") this.bossImg=Util.GetGameObject(self.gameObject, "Bg/btnDown/bossObj/icon"):GetComponent("Image")