From a506dc79978bbc4390ed39b342c064890c69b80d Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Fri, 2 Sep 2022 14:26:03 +0800 Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Popup/HomeLandEquipPopup.prefab | 158 +++++++++++++++++- .../~Lua/Modules/Popup/HomeLandEquipPopup.lua | 5 +- 2 files changed, 157 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/HomeLandEquipPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/HomeLandEquipPopup.prefab index b69bb9deed..2a54c13669 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/HomeLandEquipPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/HomeLandEquipPopup.prefab @@ -3676,6 +3676,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4355304727806697646 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1005952900128289474} + - component: {fileID: 944435349823632879} + - component: {fileID: 4629522569406945624} + m_Layer: 5 + m_Name: line (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1005952900128289474 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4355304727806697646} + 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: 4801174563047849483} + 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: -692} + m_SizeDelta: {x: 800, y: 6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &944435349823632879 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4355304727806697646} + m_CullTransparentMesh: 0 +--- !u!114 &4629522569406945624 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4355304727806697646} + 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: 26ce1a2f8851e004e88e569a15a5a1f8, 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 &4516392189414253216 GameObject: m_ObjectHideFlags: 0 @@ -4297,7 +4371,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 78.5, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7067334352339129693 @@ -4663,6 +4737,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5857681094420245122 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2731057438164366439} + - component: {fileID: 3060272511692426965} + - component: {fileID: 4032389592690470125} + m_Layer: 5 + m_Name: line (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2731057438164366439 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5857681094420245122} + 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: 4801174563047849483} + m_RootOrder: 4 + 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: -170} + m_SizeDelta: {x: 800, y: 6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3060272511692426965 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5857681094420245122} + m_CullTransparentMesh: 0 +--- !u!114 &4032389592690470125 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5857681094420245122} + 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: 26ce1a2f8851e004e88e569a15a5a1f8, 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 &5863716864364906232 GameObject: m_ObjectHideFlags: 0 @@ -5585,7 +5733,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 373.5, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1621572057623206450 @@ -6260,7 +6408,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 163.5, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8723016126902911331 @@ -7063,7 +7211,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 254.5, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3407974501300458365 @@ -7897,6 +8045,8 @@ RectTransform: - {fileID: 8245838212525092709} - {fileID: 5326528117838615848} - {fileID: 1338144498007651056} + - {fileID: 2731057438164366439} + - {fileID: 1005952900128289474} m_Father: {fileID: 5409149396639897811} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/HomeLandEquipPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/HomeLandEquipPopup.lua index 74190c9a78..9d951f72b6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/HomeLandEquipPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/HomeLandEquipPopup.lua @@ -169,7 +169,7 @@ function this:SetData() this.Btn1:GetComponent("Button").enabled = true if HomeLandManager.BuildData[limit[1]].level >= limit[2] then - this.costCondition.text = "" + this.costCondition.text = "强化消耗:" this.costIcon.gameObject:SetActive(true) this.costNum.gameObject:SetActive(true) @@ -209,7 +209,8 @@ function this:SetData() this.Tips:SetActive(false) this.costIcon.gameObject:SetActive(true) this.costNum.gameObject:SetActive(true) - this.costCondition.gameObject:SetActive(false) + -- this.costCondition.gameObject:SetActive(false) + this.costCondition.text = "突破消耗:" --突破的消耗和升级不同 local cost = equipRankUpConfig.Cost local color2 = BagManager.GetTotalItemNum(cost[1][1]) >= cost[1][2] and "#FFEED6" or "red"