From 9a1646ec480e7d9f7bc55e66063225b12ebfde0a Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Thu, 26 Oct 2023 20:54:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E5=AE=9D=E5=8D=87=E7=BA=A7=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/RoleInfo/FaLingUpStarListPanel.prefab | 80 +++++++++++++++++++ .../RoleInfo/FaLingUpStarListPanel.lua | 6 +- 2 files changed, 85 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/FaLingUpStarListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/FaLingUpStarListPanel.prefab index 9e303423c4..710b49bfdd 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/FaLingUpStarListPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/FaLingUpStarListPanel.prefab @@ -1198,6 +1198,7 @@ RectTransform: - {fileID: 224046576324473288} - {fileID: 3126042381863009347} - {fileID: 5865085242572668534} + - {fileID: 6494242814012644761} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3100,3 +3101,82 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &8304115246423989908 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6494242814012644761} + - component: {fileID: 7800766923040842317} + - component: {fileID: 8428332301786832640} + m_Layer: 5 + m_Name: infoTxt + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6494242814012644761 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8304115246423989908} + 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: 224922477455617218} + 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} + m_AnchoredPosition: {x: 0, y: -550} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7800766923040842317 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8304115246423989908} + m_CullTransparentMesh: 0 +--- !u!114 &8428332301786832640 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8304115246423989908} + 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.754717, g: 0.4637951, b: 0.10323961, 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: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: New Text diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaLingUpStarListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaLingUpStarListPanel.lua index e5a609136a..c5ab9b9cce 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaLingUpStarListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaLingUpStarListPanel.lua @@ -29,6 +29,7 @@ function FaLingUpStarListPanel:InitComponent() this.NoneImage= Util.GetGameObject(self.gameObject, "NoneImage") this.NoneImage.gameObject:SetActive(false) + this.infoTxt=Util.GetGameObject(self.gameObject, "infoTxt"):GetComponent("Text") end --绑定事件(用于子类重写) @@ -88,7 +89,7 @@ function FaLingUpStarListPanel:OnOpen(heroData,_openThisPanel,_curSelectHeroList this.ScrollView:SetData(heroDataList, function (index, go) this.OnShowSingleCardData(go, heroDataList[index]) end,false,false) - + this.infoTxt.text=string.format("强化所要法宝 %s/%s",#curSelectHeroList,curNeedRoleNum) end function this.OnClickEnterHero(go,heroData,type) this.OnShowSingleCardData(go,heroData,type) @@ -146,6 +147,7 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择 table_removebyvalue(curSelectHeroList,heroData.did) isSelect=false choosed:SetActive(false) + this.infoTxt.text=string.format("强化所要法宝 %s/%s",#curSelectHeroList,curNeedRoleNum) return end if LengthOfTable(curSelectHeroList)>=curNeedRoleNum then @@ -157,6 +159,7 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择 table.insert(curSelectHeroList,heroData.did) isSelect=true choosed:SetActive(true) + this.infoTxt.text=string.format("强化所要法宝 %s/%s",#curSelectHeroList,curNeedRoleNum) end local args={} args[1]="法宝已经升级、升星,作为其他法宝的材料将不会返还升级、升星材料" @@ -168,6 +171,7 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择 table.insert(curSelectHeroList,heroData.did) isSelect=true choosed:SetActive(true) + this.infoTxt.text=string.format("强化所要法宝 %s/%s",#curSelectHeroList,curNeedRoleNum) end end)