diff --git a/Assets/ManagedResources/Prefabs/UI/RewardBox/RewardBoxPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RewardBox/RewardBoxPanel.prefab index baa2f34a49..8172e8d683 100644 --- a/Assets/ManagedResources/Prefabs/UI/RewardBox/RewardBoxPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RewardBox/RewardBoxPanel.prefab @@ -114,7 +114,7 @@ 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: -69, y: 0} + m_AnchoredPosition: {x: -69, y: -2} m_SizeDelta: {x: 300, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6064037070582169897 @@ -756,8 +756,8 @@ RectTransform: m_Father: {fileID: 65547229994728269} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 11.4} m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} @@ -1393,6 +1393,7 @@ RectTransform: - {fileID: 1850525865902583112} - {fileID: 6339706686926974974} - {fileID: 202505673907532865} + - {fileID: 4175560960203571540} m_Father: {fileID: 4197229008271411681} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2798,7 +2799,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -3496,6 +3497,86 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &8845988532970023441 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4175560960203571540} + - component: {fileID: 1896678867995730392} + - component: {fileID: 1057019004143886159} + m_Layer: 5 + m_Name: des + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4175560960203571540 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8845988532970023441} + 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: 773274248527752682} + m_RootOrder: 3 + 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: -69, y: 48} + m_SizeDelta: {x: 300, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1896678867995730392 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8845988532970023441} + m_CullTransparentMesh: 0 +--- !u!114 &1057019004143886159 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8845988532970023441} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.65882355, g: 0.06506352, b: 0.007843147, 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: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 300 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u96F7\u9707\u5B50\u788E\u7247" + LanguageIndex: 0 --- !u!1 &9122350590757992458 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua b/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua index 0bb4a60913..bbb82f49f9 100644 --- a/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua @@ -191,6 +191,8 @@ function RewardBoxPanel:SetSingleGiftData(index,item,dataList) local icon = Util.GetGameObject(item,"icon") local yihuode = Util.GetGameObject(icon,"yihuode") local tip = Util.GetGameObject(item,"tip"):GetComponent("Text") + local des = Util.GetGameObject(item,"des"):GetComponent("Text") + des.gameObject:SetActive(false) local select = Util.GetGameObject(item,"select") local go = Util.GetGameObject(item,"select/Go") @@ -202,16 +204,17 @@ function RewardBoxPanel:SetSingleGiftData(index,item,dataList) view.transform:SetAsFirstSibling() itemIconList[item] = view end + local heroConfig=itemConfig[dataList[index][1]] itemIconList[item]:OnOpen(false,dataList[index],1,false, false, false, self.sortingOrder) itemIconList[item].gameObject:SetActive(true) itemIconList[item]:SetEffectLayer(self.sortingOrder) - tip.text = GetLanguageStrById(itemConfig[dataList[index][1]].Name) - + tip.text = GetLanguageStrById(heroConfig.Name) + --判断是否是在背包界面打开 select:GetComponent("Button").interactable = BagManager.isBagPanel select:SetActive(BagManager.isBagPanel) yihuode:SetActive(false) - if itemConfig[dataList[index][1]].ItemType == ItemType.Incarnation and BagManager.isBagPanel then + if heroConfig.ItemType == ItemType.Incarnation and BagManager.isBagPanel then local num = BagManager.GetItemCountById(dataList[index][1]) if num > 0 or IncarnationManager.GetStatusByItemId(dataList[index][1]) >= 0 then select:SetActive(false) @@ -221,6 +224,15 @@ function RewardBoxPanel:SetSingleGiftData(index,item,dataList) yihuode:SetActive(false) end end + if heroConfig.ItemType == ItemType.Talisman then + if heroConfig.ItemDescribe then + local aaa=string.split(heroConfig.ItemDescribe,',') + if aaa and #aaa>0 then + des.gameObject:SetActive(true) + des.text=aaa[1] + end + end + end --判断是否选了该物品 if curId == dataList[index][1] then go:SetActive(true)