From 0939d80af9a781411893a9d56c689f6b0b964a07 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Mon, 13 Nov 2023 18:46:25 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E4=BF=A1=E6=81=AF=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/RoleInfo/RoleInfoPanel.prefab | 89 +++++++++++++++++-- .../~Lua/Modules/RoleInfo/RoleInfoPanel.lua | 20 +++-- 2 files changed, 93 insertions(+), 16 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab index be8d7e4556..8f84e73329 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab @@ -332,8 +332,8 @@ RectTransform: 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: 0, y: -137.3} - m_SizeDelta: {x: 160, y: 100} + m_AnchoredPosition: {x: 0, y: -107.29} + m_SizeDelta: {x: 160, y: 39.99} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &445418127 CanvasRenderer: @@ -370,11 +370,11 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 0 + m_Alignment: 1 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u725B\u6C14\u51B2\u5929\n" --- !u!1 &619906901 @@ -750,12 +750,13 @@ RectTransform: - {fileID: 378152831} - {fileID: 1302848600} - {fileID: 445418125} + - {fileID: 6103594097152510646} m_Father: {fileID: 6071866788121536098} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -146.29999, y: -148.70001} + m_AnchoredPosition: {x: -448, y: -148.70001} m_SizeDelta: {x: 184, y: 175} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1754900210 @@ -873,7 +874,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: f2393ce2d23f490409ca62cfa0b8f917, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -59783,6 +59784,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &6318340606830563293 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6103594097152510646} + - component: {fileID: 1223529357107371410} + - component: {fileID: 5256843820892179400} + m_Layer: 0 + m_Name: select + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6103594097152510646 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6318340606830563293} + 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_Father: {fileID: 1754900208} + m_RootOrder: 5 + 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: 0, y: 0} + m_SizeDelta: {x: 185, y: 170} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1223529357107371410 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6318340606830563293} + m_CullTransparentMesh: 0 +--- !u!114 &5256843820892179400 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6318340606830563293} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 70880bb948d704640910d7f25d8c5294, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &6328467609162209064 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index a6f5fbb626..bf45964c6c 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -6,19 +6,19 @@ local _CurPageIndex = 1 local orginLayer local tabsList = {} local tabs = { - [RoleInfoPanelIndex.qingbao] = {default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",title = Language[11093],rpType = -1, + [RoleInfoPanelIndex.qingbao] = {default = "UI_hz_gonghui_31", lock = "UI_hz_gonghui_31", select = "UI_hz_gonghui_31",title = Language[11093],rpType = -1, }, - [RoleInfoPanelIndex.shenhun] = {default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",title = "神魂",rpType = -1, + [RoleInfoPanelIndex.shenhun] = {default = "UI_hz_gonghui_32", lock = "UI_hz_gonghui_32", select = "UI_hz_gonghui_32",title = "神魂",rpType = -1, }, - [RoleInfoPanelIndex.jinjie] = {default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",title = Language[11815],rpType = -1, + [RoleInfoPanelIndex.jinjie] = {default = "UI_hz_gonghui_33", lock = "UI_hz_gonghui_33", select = "UI_hz_gonghui_33",title = Language[11815],rpType = -1, }, - [RoleInfoPanelIndex.juexing] = {default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",title = Language[10373],rpType = -1, + [RoleInfoPanelIndex.juexing] = {default = "UI_hz_gonghui_34", lock = "UI_hz_gonghui_34", select = "UI_hz_gonghui_34",title = Language[10373],rpType = -1, }, - [RoleInfoPanelIndex.chuanshuo] = {default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",title = Language[11095],rpType = -1, + [RoleInfoPanelIndex.chuanshuo] = {default = "UI_hz_gonghui_31", lock = "UI_hz_gonghui_31", select = "UI_hz_gonghui_31",title = Language[11095],rpType = -1, }, - [RoleInfoPanelIndex.pifu] = {default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",title = Language[11816],rpType = -1, + [RoleInfoPanelIndex.pifu] = {default = "UI_hz_gonghui_32", lock = "UI_hz_gonghui_32", select = "UI_hz_gonghui_32",title = Language[11816],rpType = -1, }, - [RoleInfoPanelIndex.feiSheng] = {default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",title = "飞升",rpType = -1, + [RoleInfoPanelIndex.feiSheng] = {default = "UI_hz_gonghui_33", lock = "UI_hz_gonghui_33", select = "UI_hz_gonghui_33",title = "飞升",rpType = -1, }, } @@ -618,11 +618,13 @@ function this:UpdateBtnList() else tabsList[k].gameObject:SetActive(true) end - local img = Util.GetGameObject(tabsList[k], "Image"):GetComponent("Image") - -- img.sprite = this.spLoader:LoadSprite("r_hero_xuanze_002") + local img = Util.GetGameObject(tabsList[k], "img"):GetComponent("Image") + img.sprite = this.spLoader:LoadSprite(tabs[k].default) local title = Util.GetGameObject(tabsList[k], "Text"):GetComponent("Text") local redpot = Util.GetGameObject(tabsList[k], "redPoint") local lock = Util.GetGameObject(tabsList[k], "lock") + local select=Util.GetGameObject(tabsList[k], "select") + --select:SetActive(sta) lock.gameObject:SetActive(false) title.text = GetCurLanguage() == 0 and v.title or ""..v.title.."" -- 判断是否需要检测红点