diff --git a/Assets/ManagedResources/Prefabs/UI/TreasureStore/TreasureStoreSeason2.prefab b/Assets/ManagedResources/Prefabs/UI/TreasureStore/TreasureStoreSeason2.prefab index 24f6b6c270..8c28cb6622 100644 --- a/Assets/ManagedResources/Prefabs/UI/TreasureStore/TreasureStoreSeason2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TreasureStore/TreasureStoreSeason2.prefab @@ -595,6 +595,7 @@ RectTransform: - {fileID: 5508053166187048960} - {fileID: 568736400138835213} - {fileID: 6942748679297584665} + - {fileID: 3593815883549836158} m_Father: {fileID: 8164929861946433763} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1608,7 +1609,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: 299, y: -33} + m_AnchoredPosition: {x: 300, y: 9} m_SizeDelta: {x: 190, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1484522529259693895 @@ -2130,3 +2131,83 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8673036166994295521} m_CullTransparentMesh: 0 +--- !u!1 &8702325810990083504 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3593815883549836158} + - component: {fileID: 704342520481547311} + - component: {fileID: 3059624038972538649} + m_Layer: 5 + m_Name: buyInfo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3593815883549836158 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8702325810990083504} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 100} + m_LocalScale: {x: 1, y: 1, z: 0.00375} + m_Children: [] + m_Father: {fileID: 6982842394998516994} + 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: 300, y: -53} + m_SizeDelta: {x: 200, y: 49.4} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &704342520481547311 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8702325810990083504} + m_CullTransparentMesh: 0 +--- !u!114 &3059624038972538649 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8702325810990083504} + 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.9921569, g: 0.9490197, b: 0.79215693, a: 1} + m_RaycastTarget: 0 + 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: 1 + m_MinSize: 20 + m_MaxSize: 30 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u5269\u4F59\uFF1A1\u6B21" + LanguageIndex: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index f491fe167b..1bf0a6b9a5 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -240,6 +240,7 @@ local TypeUpdateFunc = { tempData.Reward = rechargeConfig[configData[j].PackId].RewardShow tempData.Price = rechargeConfig[configData[j].PackId].Price tempData.progress = curData.rewards[i].progress + tempData.canBuy = OperatingManager.GetLeftBuyTime(5,tempData.PackId) --插入数据2维 [天数][第几个] table.insert(curData.FreelyData[configData[j].Sort],tempData) end diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStoreSeason2.lua b/Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStoreSeason2.lua index 528398006d..6c1aff9aa5 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStoreSeason2.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStoreSeason2.lua @@ -112,12 +112,21 @@ function TreasureStoreSeason2:ShowSingleData(_go,_data,_index) local buyBtn = Util.GetGameObject(_go,"buy") local price = Util.GetGameObject(buyBtn,"Text"):GetComponent("Text") local redPoint = Util.GetGameObject(buyBtn,"redPoint") + local times = Util.GetGameObject(_go,"buyInfo"):GetComponent("Text") title.text = _data.Name price.text = _data.Price.."元" Util.SetGray(buyBtn,_data.progress == 8) Util.SetGray(redPoint,false) redPoint:SetActive(_data.progress == 1 and _data.Price == 0) + times.gameObject:SetActive(_data.progress == 1) + if _data.progress == 1 then + times.gameObject:SetActive(true) + times.text = string.format( "剩余:%s次",_data.canBuy) + else + times.gameObject:SetActive(false) + times.text = "" + end if not self.itemViewList[_go] then self.itemViewList[_go] = {} @@ -138,8 +147,6 @@ function TreasureStoreSeason2:ShowSingleData(_go,_data,_index) if _data.progress == 1 then PayManager.Pay(_data.PackId, function(id) FirstRechargeManager.RefreshAccumRechargeValue(_data.PackId) - OperatingManager.SetHadBuyGoodsId({_data.PackId}) - OperatingManager.RemoveItemInfoByType(GoodsTypeDef.DirectPurchaseGift, _data.PackId) self:OnShow() end) end