diff --git a/Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab index 82eea9ee44..9029cf544a 100644 --- a/Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab @@ -2562,6 +2562,7 @@ RectTransform: - {fileID: 385388484551122306} - {fileID: 1761443226} - {fileID: 847414780} + - {fileID: 1742045815411950608} - {fileID: 3323556261341898494} - {fileID: 1493839893438661982} m_Father: {fileID: 476257756925467703} @@ -26180,7 +26181,7 @@ RectTransform: - {fileID: 7120559639308866056} - {fileID: 1812830210508857818} m_Father: {fileID: 477052176326366535} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -31829,6 +31830,85 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5268197713632800683 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8339799421770432238} + - component: {fileID: 8807741487443831852} + - component: {fileID: 4394507928349585874} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8339799421770432238 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5268197713632800683} + 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: 1742045815411950608} + m_RootOrder: 0 + 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: 32, y: 32} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8807741487443831852 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5268197713632800683} + m_CullTransparentMesh: 0 +--- !u!114 &4394507928349585874 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5268197713632800683} + 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: 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 23 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 100 --- !u!1 &5286697456524028243 GameObject: m_ObjectHideFlags: 0 @@ -32096,6 +32176,81 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5524262712782534990 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1742045815411950608} + - component: {fileID: 7412603647715349218} + - component: {fileID: 1003782327275308636} + m_Layer: 5 + m_Name: middleDownLv + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1742045815411950608 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5524262712782534990} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.00991, y: 1.00991, z: 1.2} + m_Children: + - {fileID: 8339799421770432238} + m_Father: {fileID: 477052176326366535} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 23.3, y: -2.6} + m_SizeDelta: {x: 43.54, y: 43.54} + m_Pivot: {x: 1, y: 0} +--- !u!222 &7412603647715349218 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5524262712782534990} + m_CullTransparentMesh: 0 +--- !u!114 &1003782327275308636 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5524262712782534990} + 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: 895a1069d68145244a20a7a3629262de, 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 &5865364227022989881 GameObject: m_ObjectHideFlags: 0 @@ -36758,7 +36913,7 @@ RectTransform: m_Children: - {fileID: 2069222669847538324} m_Father: {fileID: 477052176326366535} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua index 84697652aa..3a1cba51ed 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua @@ -410,6 +410,8 @@ function this.SingleItemDataShow(_go, _itemData) local num = Util.GetGameObject(_go.gameObject, "GameObject/item/num") local strongLv=Util.GetGameObject(_go.gameObject, "GameObject/item/lv"):GetComponent("Text") local refine=Util.GetGameObject(_go.gameObject, "GameObject/item/refine"):GetComponent("Text") + local treeLv=Util.GetGameObject(_go.gameObject, "GameObject/item/middleDownLv/Text"):GetComponent("Text") + local treeLvObj=Util.GetGameObject(_go.gameObject, "GameObject/item/middleDownLv") local resetLv = Util.GetGameObject(_go.gameObject, "GameObject/item/resetLv") local talismanStar = Util.GetGameObject(_go.gameObject, "GameObject/item/talismanStar") local fragmentIcon = Util.GetGameObject(_go.transform, "GameObject/item/fragmentIcon"):GetComponent("Image") @@ -419,6 +421,7 @@ function this.SingleItemDataShow(_go, _itemData) resetLv:SetActive(false) talismanStar:SetActive(false) strongLv.gameObject:SetActive(false) + treeLvObj.gameObject:SetActive(false) refine.gameObject:SetActive(false) time.gameObject:SetActive(false) if _itemData.itemConfig then @@ -495,6 +498,10 @@ function this.SingleItemDataShow(_go, _itemData) refine.gameObject:SetActive(true) refine.text="+".._itemData.refineLv end + if _itemData.treeLv>0 then + treeLvObj.gameObject:SetActive(true) + treeLv.text=_itemData.treeLv + end fragmentIcon.gameObject:SetActive(true) fragmentIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(itemConfig[_itemData.itemConfig.Id].PropertyName)) elseif _itemData.itemConfig.ItemType == ItemType.HunYin or _itemData.itemConfig.ItemType == ItemType.GodPrint then diff --git a/Assets/ManagedResources/~Lua/View/ItemView.lua b/Assets/ManagedResources/~Lua/View/ItemView.lua index c205291eaa..a1dcb2b86c 100644 --- a/Assets/ManagedResources/~Lua/View/ItemView.lua +++ b/Assets/ManagedResources/~Lua/View/ItemView.lua @@ -763,7 +763,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage) else self.resetLv.gameObject:SetActive(false) end - if data.treeLv > 0 and data.upHeroDid ~= "" and tostring(data.upHeroDid) ~= tostring(0) then + if data.treeLv > 0 then self.middleDownLv.gameObject:SetActive(true) local lv = data.treeLv if data.treeLv > data.maxTreeLv then