From 7f9868ca59501f3760778a0f496c43f06e181c34 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Tue, 18 Jan 2022 10:45:39 +0800 Subject: [PATCH] =?UTF-8?q?[bug]=3D=3D=3D=3D=3D=E5=A5=96=E6=B1=A0=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=9B=BE=E9=89=B4=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=B7=BB=E5=8A=A0=E7=82=B9=E5=87=BB=E5=8F=8D=E9=A6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/RoleInfo/HandBookRoleInfoLayout.prefab | 71 +++++++------------ .../Modules/Recruit/HeroPreviewNewPanel.lua | 11 ++- 2 files changed, 34 insertions(+), 48 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/HandBookRoleInfoLayout.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/HandBookRoleInfoLayout.prefab index 3285e1cbc3..d7ca4ccf52 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/HandBookRoleInfoLayout.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/HandBookRoleInfoLayout.prefab @@ -3361,7 +3361,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: 315, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 1, y: 0.5} --- !u!222 &2869837981932690049 @@ -5335,6 +5335,7 @@ GameObject: - component: {fileID: 3941673511622965647} - component: {fileID: 2785837382319435049} - component: {fileID: 8945870842926663208} + - component: {fileID: 5608871416415651546} m_Layer: 5 m_Name: dingwei m_TagString: Untagged @@ -5418,7 +5419,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 3 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} @@ -5470,6 +5471,25 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!95 &5608871416415651546 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5056771340439473104} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &5168367206551728392 GameObject: m_ObjectHideFlags: 0 @@ -7314,7 +7334,6 @@ GameObject: - component: {fileID: 7019505148616658685} - component: {fileID: 9114218537319145345} - component: {fileID: 4736815770412586932} - - component: {fileID: 3366190939807037850} - component: {fileID: 4774707911790346556} m_Layer: 5 m_Name: posBtn @@ -7339,8 +7358,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 35, y: 0} - m_SizeDelta: {x: 70, y: 80} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9114218537319145345 CanvasRenderer: @@ -7379,48 +7398,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!114 &3366190939807037850 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7502580929939828163} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 4736815770412586932} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &4774707911790346556 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/HeroPreviewNewPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/HeroPreviewNewPanel.lua index 3fc306393a..221b5d75be 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/HeroPreviewNewPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/HeroPreviewNewPanel.lua @@ -259,6 +259,11 @@ function this.SwitchView(index) this.List5[i].gameObject:SetActive(true) end + for i = 1, #this.List6 do + if this.List6[i] then + this.List6[i].gameObject:SetActive(false) + end + end for i = 1, #sixData do if not this.List6[i] then this.List6[i] = SubUIManager.Open(SubUIConfig.ItemView,this.sixGrid.transform) @@ -278,7 +283,11 @@ function this.SwitchView(index) -- this.List6[i].name:GetComponent("Text").text=""..string.format("%.2f", (sixData[i].WeightShow/100000)*100) .."%" -- this.List6[i].gameObject:SetActive(true) -- end - + for i = 1, #this.List7 do + if this.List7[i] then + this.List7[i].gameObject:SetActive(false) + end + end for i = 1, #sevenData do if not this.List7[i] then this.List7[i] = SubUIManager.Open(SubUIConfig.ItemView,this.sevenGrid.transform)