diff --git a/Assets/ManagedResources/Prefabs/UI/UppperMonthCardView/UppperMonthCard.prefab b/Assets/ManagedResources/Prefabs/UI/UppperMonthCardView/UppperMonthCard.prefab index 6e0f59857e..51427ed6ba 100644 --- a/Assets/ManagedResources/Prefabs/UI/UppperMonthCardView/UppperMonthCard.prefab +++ b/Assets/ManagedResources/Prefabs/UI/UppperMonthCardView/UppperMonthCard.prefab @@ -325,7 +325,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8653338172792289727 RectTransform: m_ObjectHideFlags: 0 @@ -477,6 +477,7 @@ RectTransform: - {fileID: 3258438445955883517} - {fileID: 2481339074999143791} - {fileID: 8653338172792289727} + - {fileID: 8900961059961251877} m_Father: {fileID: 8771955440447412165} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -751,6 +752,85 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5102195846956253371 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8900961059961251877} + - component: {fileID: 706728126049573926} + - component: {fileID: 3943079612183574262} + m_Layer: 5 + m_Name: tip + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8900961059961251877 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5102195846956253371} + 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: 9193407636057667010} + 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: 1.300061, y: -364.95} + m_SizeDelta: {x: 808, y: 72.1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &706728126049573926 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5102195846956253371} + m_CullTransparentMesh: 0 +--- !u!114 &3943079612183574262 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5102195846956253371} + 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: 44 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 44 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u6B21\u65E50\u70B9\u5237\u65B0\u540E\u53EF\u518D\u6B21\u8D2D\u4E70" --- !u!1 &5292033522315147608 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua index 6d07b6fbb1..e5ff5e01e1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua @@ -66,6 +66,8 @@ function UpperMonthCard:InitComponent() self.btnBuyRed = Util.GetGameObject(self.btnBuy, "red") self.btnHelp = Util.GetGameObject(self.gameObject, "Bg/helpBtn") self.helpPosition = self.btnHelp:GetComponent("RectTransform").localPosition + + self.tip = Util.GetGameObject(self.gameObject, "Bg/tip") ---- 奖励列表 self.itemLst = {} end @@ -111,10 +113,10 @@ function UpperMonthCard:OnOpen(_activityConfig,_index,parent) end function UpperMonthCard:OnSortingOrderChange(_sortingOrder) - -- self.sortingOrder = _sortingOrder - -- for k,v in pairs(self.itemLst) do - - -- end + self.sortingOrder = _sortingOrder + for k,v in pairs(self.itemLst) do + v.itemView:SetEffectLayer(self.sortingOrder) + end end -- 打开,重新打开时回调 @@ -201,26 +203,39 @@ end --- 根据是否购买了显示信息 function UpperMonthCard:SetBuyState() if self.actInfo.value < 2 then + self.btnBuy.gameObject:SetActive(true) self.btnBuyImage.sprite = self.spLoader:LoadSprite(state[0].bg) self.textBuy.text = MoneyUtil.GetMoneyUnitNameWithMoney(chargeConfig[self.baseType].Price) self.btnBuyRed.gameObject:SetActive(false) + self.tip.gameObject:SetActive(false) else self.isGet = false + self.isAllGet = true for i = 1,#self.actInfo.mission do if self.actInfo.mission[i].state == 0 and self.actInfo.mission[i].progress == 1 then self.isGet = true - break - end + end + if self.actInfo.mission[i].state == 0 then + self.isAllGet = false + end end if self.isGet then + self.btnBuy.gameObject:SetActive(true) self.btnBuyImage.sprite = self.spLoader:LoadSprite(state[1].bg) self.textBuy.text = state[1].text self.btnBuyRed.gameObject:SetActive(true) + self.tip.gameObject:SetActive(false) else + self.btnBuy.gameObject:SetActive(true) self.btnBuyImage.sprite = self.spLoader:LoadSprite(state[2].bg) self.textBuy.text = state[2].text self.btnBuyRed.gameObject:SetActive(false) + self.tip.gameObject:SetActive(false) end + if self.isAllGet then + self.btnBuy.gameObject:SetActive(false) + self.tip.gameObject:SetActive(true) + end end end