diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/FaLingListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/FaLingListPanel.prefab index 874575aa57..232e676250 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/FaLingListPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/FaLingListPanel.prefab @@ -1,5 +1,84 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1356370355 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1356370356} + - component: {fileID: 1356370358} + - component: {fileID: 1356370357} + m_Layer: 5 + m_Name: belongName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1356370356 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1356370355} + 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: 224425323862157322} + m_RootOrder: 9 + 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: 0, y: -36.699997} + m_SizeDelta: {x: 150, y: 31.5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1356370358 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1356370355} + m_CullTransparentMesh: 0 +--- !u!114 &1356370357 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1356370355} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.83137256, g: 0.36078432, b: 0.03529412, 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 22 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 235 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u4E13\u5C5E\u795E" --- !u!1 &1151118310556660 GameObject: m_ObjectHideFlags: 0 @@ -657,7 +736,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 16, y: -47.8} + m_AnchoredPosition: {x: 16, y: -47.799988} m_SizeDelta: {x: 251.7, y: 64.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222777620752913476 @@ -756,6 +835,7 @@ RectTransform: - {fileID: 224862721559259432} - {fileID: 4898173623524441767} - {fileID: 2141156394043546534} + - {fileID: 1356370356} m_Father: {fileID: 224922477455617218} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -779,7 +859,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1481146662892558} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -2287,7 +2367,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 22 m_FontStyle: 0 m_BestFit: 0 @@ -2562,7 +2642,7 @@ RectTransform: 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: 0, y: -15.76} + m_AnchoredPosition: {x: 0, y: -12.400002} m_SizeDelta: {x: 150, y: 31.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5103503315900522486 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaLingListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaLingListPanel.lua index 75fd67110b..64964222ea 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaLingListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaLingListPanel.lua @@ -22,7 +22,7 @@ function FaLingListPanel:InitComponent() --LogGreen("v.width:".. v.width.." v.height:"..v.height) this.Scrollbar= Util.GetGameObject(self.gameObject, "Scrollbar"):GetComponent("Scrollbar") this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView,Util.GetGameObject(self.gameObject, "scroll").transform, - this.cardPre, this.Scrollbar, Vector2.New(v.width, v.height), 1, 5, Vector2.New(19.32,40)) + this.cardPre, this.Scrollbar, Vector2.New(v.width, v.height), 1, 5, Vector2.New(19.32,50)) this.ScrollView.gameObject:GetComponent("RectTransform").anchoredPosition = Vector2.New(6.78, 27) this.ScrollView.gameObject:GetComponent("RectTransform").anchorMin = Vector2.New(0.5, 0.5) this.ScrollView.gameObject:GetComponent("RectTransform").anchorMax = Vector2.New(0.5, 0.5) @@ -115,6 +115,7 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择 local lvGo = Util.GetGameObject(go.transform, "lv"):GetComponent("Text") local icon = Util.GetGameObject(go.transform, "icon"):GetComponent("Image") local name = Util.GetGameObject(go.transform, "name"):GetComponent("Text") + local belongName=Util.GetGameObject(go.transform, "belongName"):GetComponent("Text") local formationMask = Util.GetGameObject(go.transform, "formationMask") local formationImage = Util.GetGameObject(formationMask.transform, "formationImage") local lockImage = Util.GetGameObject(formationMask.transform, "lockImage") @@ -122,7 +123,6 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择 local starGrid = Util.GetGameObject(go.transform, "star") local cardBtn = Util.GetGameObject(go.transform, "icon") - LogError("22222222222") local itemConfig=heroData.itemConfig frame.sprite = this.spLoader:LoadSprite(heroData.frame) if heroData.lv>0 then @@ -137,6 +137,13 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择 lockImage:SetActive(false) name.text = SubString2(GetLanguageStrById(itemConfig.Name),8) local talismana=ConfigManager.GetConfigDataByDoubleKey(ConfigName.EquipTalismana,"TalismanaId",heroData.staticId,"Level",heroData.lv) + local heroId=talismana.HeroID + local heroConfig=ConfigManager.GetConfigData(ConfigName.HeroConfig,heroId) + if heroConfig then + belongName.text=heroConfig.ReadingName.."专属" + else + belongName.text="" + end local star=talismana.Star if star>0 then starGrid:SetActive(true)