diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab index 0a0d7e230f..1dab852b8e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab @@ -1146,7 +1146,7 @@ RectTransform: - {fileID: 3157604295042493341} - {fileID: 914848124} m_Father: {fileID: 6065416689396146902} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2543,6 +2543,124 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 15 +--- !u!1 &492744731992278697 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1948612919371492188} + - component: {fileID: 981436460608168278} + - component: {fileID: 1802712187114948697} + - component: {fileID: 2467485377454109152} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1948612919371492188 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 492744731992278697} + 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: + - {fileID: 2275506726547245868} + m_Father: {fileID: 32732786351558474} + m_RootOrder: 1 + 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: 383, y: 92} + m_SizeDelta: {x: 200, y: 69} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &981436460608168278 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 492744731992278697} + m_CullTransparentMesh: 0 +--- !u!114 &1802712187114948697 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 492744731992278697} + 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: 98b646746e686b6438555ec8552ecc60, 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!114 &2467485377454109152 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 492744731992278697} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1802712187114948697} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &516963492534623039 GameObject: m_ObjectHideFlags: 0 @@ -2727,7 +2845,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6065416689396146902} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -2947,7 +3065,9 @@ RectTransform: 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_Children: + - {fileID: 5480905530965273154} + - {fileID: 1948612919371492188} m_Father: {fileID: 6065416689396146902} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3104,7 +3224,6 @@ RectTransform: - {fileID: 4030831344110493642} - {fileID: 6879224402960521530} - {fileID: 32732786351558474} - - {fileID: 5480905530965273154} - {fileID: 987080635761478543} - {fileID: 8481690243604474688} - {fileID: 2657512331265307850} @@ -3605,7 +3724,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6065416689396146902} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4418,7 +4537,7 @@ RectTransform: - {fileID: 7330114017493364820} - {fileID: 5840688982553810049} m_Father: {fileID: 6065416689396146902} - m_RootOrder: 6 + 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} @@ -4639,16 +4758,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2193643122944875651} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 6065416689396146902} - m_RootOrder: 4 + m_Father: {fileID: 32732786351558474} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 540, y: -549} + m_AnchoredPosition: {x: 292, y: -43.5} m_SizeDelta: {x: 505.95, y: 54.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &97633444040451637 @@ -4694,6 +4813,85 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u91CD\u7F6E\u65F6\u95F4\uFF1A 62\uFF1A55\uFF1A43" LanguageIndex: 10466 +--- !u!1 &2202186861074279680 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2275506726547245868} + - component: {fileID: 2619629757197424516} + - component: {fileID: 4515870811097866561} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2275506726547245868 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2202186861074279680} + 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: 1948612919371492188} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2619629757197424516 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2202186861074279680} + m_CullTransparentMesh: 0 +--- !u!114 &4515870811097866561 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2202186861074279680} + 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: 0.9725491, g: 0.9843138, b: 0.8196079, 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: 35 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u4E00\u952E\u8D2D\u4E70" --- !u!1 &2273627714793912849 GameObject: m_ObjectHideFlags: 0 @@ -6329,7 +6527,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0.00001998531, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &6954504526559241720 @@ -6805,7 +7003,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: 439, y: 90} + m_AnchoredPosition: {x: 439, y: 154} m_SizeDelta: {x: 204, y: 144} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9048149385950384945 @@ -9832,7 +10030,7 @@ RectTransform: - {fileID: 6572235485989589004} - {fileID: 1832560383} m_Father: {fileID: 6065416689396146902} - m_RootOrder: 5 + 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} @@ -12428,7 +12626,7 @@ PrefabInstance: - target: {fileID: 224764860612850798, guid: 584f6c7286705c645ab8323012566269, type: 3} propertyPath: m_AnchoredPosition.y - value: 579 + value: 650 objectReference: {fileID: 0} - target: {fileID: 224764860612850798, guid: 584f6c7286705c645ab8323012566269, type: 3} @@ -12536,15 +12734,15 @@ PrefabInstance: type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 584f6c7286705c645ab8323012566269, type: 3} ---- !u!224 &4030831344110493642 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 224764860612850798, guid: 584f6c7286705c645ab8323012566269, - type: 3} - m_PrefabInstance: {fileID: 3814238493100927908} - m_PrefabAsset: {fileID: 0} --- !u!1 &3812896437756706176 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1342128629339684, guid: 584f6c7286705c645ab8323012566269, type: 3} m_PrefabInstance: {fileID: 3814238493100927908} m_PrefabAsset: {fileID: 0} +--- !u!224 &4030831344110493642 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 224764860612850798, guid: 584f6c7286705c645ab8323012566269, + type: 3} + m_PrefabInstance: {fileID: 3814238493100927908} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua index a445a4c771..bcdf4befd1 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua @@ -199,12 +199,20 @@ end --界面销毁时调用(用于子类重写) function LeiJiChongZhiPage:OnDestroy() + if self.timer then + self.timer:Stop() + self.timer = nil + end sortingOrder = 0 allData={} itemsGrid = {} end function LeiJiChongZhiPage:OnHide() + if self.timer then + self.timer:Stop() + self.timer = nil + end sortingOrder = 0 end --- 将一段时间转换为天时分秒 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua index 9585b879ad..36e500c1a8 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua @@ -180,12 +180,18 @@ end --界面销毁时调用(用于子类重写) function XianShiShangShi:OnDestroy() - + if self.timer then + self.timer:Stop() + self.timer = nil + end sortingOrder = 0 end function XianShiShangShi:OnHide() - + if self.timer then + self.timer:Stop() + self.timer = nil + end sortingOrder = 0 end diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua index 49a1254fb7..a46412da87 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua @@ -180,12 +180,18 @@ end --界面销毁时调用(用于子类重写) function ZhenQiYiBaoPage:OnDestroy() - + if self.timer then + self.timer:Stop() + self.timer = nil + end sortingOrder = 0 end function ZhenQiYiBaoPage:OnHide() - + if self.timer then + self.timer:Stop() + self.timer = nil + end sortingOrder = 0 end diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua index b8b5003955..7babaace03 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua @@ -34,8 +34,10 @@ function GiftView:InitComponent(gameObject) self.freeBtn=Util.GetGameObject(gameObject,"rzyBg/freeBtn") self.freeBtnAnim=Util.GetGameObject(gameObject,"rzyBg/freeBtn/UI_effect_TanSuo_Box"):GetComponent("Animator") self.redPoint=Util.GetGameObject(gameObject,"rzyBg/freeBtn/redPoint") - self.endTime = Util.GetGameObject(gameObject, "rzyBg/endTime"):GetComponent("Text") + self.endTime = Util.GetGameObject(gameObject, "rzyBg/Image/endTime"):GetComponent("Text") self.endTimeBg = Util.GetGameObject(gameObject, "rzyBg/Image") + self.buyAllBtn = Util.GetGameObject(gameObject, "rzyBg/Image/Button") + self.buyAllBtn:SetActive(true) self.scrollItem = Util.GetGameObject(gameObject, "rzyBg/scrollItem") self.tip3 = Util.GetGameObject(gameObject, "rzyBg/tip3") self.lightList = { @@ -66,6 +68,20 @@ function GiftView:InitComponent(gameObject) end function GiftView:BindEvent() + Util.AddClick(self.buyAllBtn,function () + if AppConst.isSDKLogin then + PayManager.Pay({ Id = 1004 }) + else + NetManager.RequestBuyGiftGoods(1004, function() + FirstRechargeManager.RefreshAccumRechargeValue(1004) + PlayerPrefs.SetInt(PlayerManager.uid.."czlb", 0) + CheckRedPointStatus(RedPointType.DailyGift) + CheckRedPointStatus(RedPointType.GrowthPackage) + timerList={} + self:RefreshGiftData() + end) + end + end) end function GiftView:OnShow(_sortingOrder, buyType) @@ -95,6 +111,7 @@ end -- 刷新礼包的数据 function GiftView:RefreshGiftData() + self:isBought() self.scrollView.gameObject:SetActive(false) self.scrollView2.gameObject:SetActive(false) self.scrollView3.gameObject:SetActive(false)--成长礼包 @@ -305,10 +322,22 @@ end --根据数字位数计算艺术字体后面的文字位置 function GiftView:SetTextPos(num1) - local x = (string.len(tostring(num1))-1)*0.6*30 - 50 + local x = (string.len(tostring(num1))-1)*18 - 50 return x end +function GiftView:isBought() + local data = OperatingManager.GetGiftGoodsInfoList(GoodsTypeDef.DirectPurchaseGift) + for i = 1, #data do + if rechargeCommodityConfig[data[i].goodsId].ShowType == 14 then + if data[i].buyTimes >0 then + self.buyAllBtn:SetActive(false) + break + end + end + end +end + --刷新每一条的显示数据 function GiftView:RefreshShowData(item, data, buyType, DataTypeIndex) --绑定组件