diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGift.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGift.prefab index 43fca484a2..7f16c076a1 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGift.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGift.prefab @@ -30,7 +30,8 @@ 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: 2498667028505852715} m_Father: {fileID: 5636580000131647777} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5022,6 +5023,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &440863214416161187 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2498667028505852715} + - component: {fileID: 8281602269773452397} + - component: {fileID: 4534817993023031077} + m_Layer: 5 + m_Name: Red + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2498667028505852715 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 440863214416161187} + 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: 4823763580221617285} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -15, y: -15} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8281602269773452397 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 440863214416161187} + m_CullTransparentMesh: 0 +--- !u!114 &4534817993023031077 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 440863214416161187} + 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: f9ea4c4aff328ff4abcc21aae0a4fa10, 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 &460685693485688084 GameObject: m_ObjectHideFlags: 0 @@ -6632,6 +6707,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2841880816417951702} m_CullTransparentMesh: 0 +--- !u!1 &2924698836330475099 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5159223071205949685} + - component: {fileID: 8124833703186339393} + - component: {fileID: 4606117138252739714} + m_Layer: 5 + m_Name: Red + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5159223071205949685 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2924698836330475099} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.375} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 231713913634012640} + 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: 15, y: -15} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8124833703186339393 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2924698836330475099} + m_CullTransparentMesh: 0 +--- !u!114 &4606117138252739714 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2924698836330475099} + 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: f9ea4c4aff328ff4abcc21aae0a4fa10, 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 &3248174679046092586 GameObject: m_ObjectHideFlags: 0 @@ -22739,7 +22888,8 @@ 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: 5159223071205949685} m_Father: {fileID: 5636580000131647777} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/RechargeView/RechargeView.prefab b/Assets/ManagedResources/Prefabs/UI/RechargeView/RechargeView.prefab index 2fe5d6cdc6..f983ca9293 100644 --- a/Assets/ManagedResources/Prefabs/UI/RechargeView/RechargeView.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RechargeView/RechargeView.prefab @@ -1208,6 +1208,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &2508041250337994998 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2285738918461012268} + - component: {fileID: 5505931023223014891} + - component: {fileID: 6267335916544844069} + m_Layer: 5 + m_Name: Red + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2285738918461012268 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2508041250337994998} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.375} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8753164551798355905} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -15, y: -15} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5505931023223014891 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2508041250337994998} + m_CullTransparentMesh: 0 +--- !u!114 &6267335916544844069 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2508041250337994998} + 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: f9ea4c4aff328ff4abcc21aae0a4fa10, 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 &2854626150616440890 GameObject: m_ObjectHideFlags: 0 @@ -2388,7 +2462,8 @@ 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: 2285738918461012268} m_Father: {fileID: 1003922527366168816} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4059,6 +4134,80 @@ MonoBehaviour: m_EffectColor: {r: 1, g: 0.85490197, b: 0.70980394, a: 1} m_EffectDistance: {x: 1, y: -1} m_UseGraphicAlpha: 1 +--- !u!1 &8838384864582364951 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7423088455683437715} + - component: {fileID: 3549184423007197957} + - component: {fileID: 6966704203801600229} + m_Layer: 5 + m_Name: Red + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7423088455683437715 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8838384864582364951} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.375} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2282424772289028199} + 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: 15, y: -15} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3549184423007197957 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8838384864582364951} + m_CullTransparentMesh: 0 +--- !u!114 &6966704203801600229 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8838384864582364951} + 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: f9ea4c4aff328ff4abcc21aae0a4fa10, 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 &8839085366466511213 GameObject: m_ObjectHideFlags: 0 @@ -4243,7 +4392,8 @@ 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: 7423088455683437715} m_Father: {fileID: 1003922527366168816} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua index 2298f87533..6a8f538f5a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua @@ -44,6 +44,8 @@ function EveryDayGiftNew:InitComponent() self.cost = Util.GetGameObject(self.btnGet,"cost") self.btnText = Util.GetGameObject(self.btnGet,"Text") self.btnRed = Util.GetGameObject(self.btnGet,"red") + self.leftRed = Util.GetGameObject(self.btnLeft,"Red") + self.rightRed = Util.GetGameObject(self.btnRight,"Red") --=================Rewards================= self.Reward = Util.GetGameObject(self.newPage,"Reward") @@ -149,7 +151,7 @@ function EveryDayGiftNew:RefreshData(none,isTop,isAni) end end ---==============================成长礼包部分==========================(rechargeViewNew中有完全相同的部分,复制过去) +--==============================成长礼包部分==========================(rechargeViewNew和EveryDayGiftNew中有完全相同的部分,复制过去) function EveryDayGiftNew:SetGrowGift() growData = DynamicActivityManager.GetGiftDataByType({{2,20}}) local rechargeNum = VipManager.GetChargedNum()--已经充值的金额 @@ -240,7 +242,7 @@ function EveryDayGiftNew:RefreshReward(Data) Util.SetGray(self.btnGet, false) if rechargeNum >= Data.data.shopItemData.BuyRule[2] then self.btnGet:GetComponent("Image").sprite = self.spLoader:LoadSprite("s_slbz_1anniuongse") - if Data.data.shopItemData.BuyRule[2] == 0 then--只有零元档有红点 + if BagManager.GetTotalItemNum(Data.data.costId) >= Data.data.price then self.btnRed:SetActive(true) end else @@ -289,6 +291,34 @@ function EveryDayGiftNew:RefreshReward(Data) self.ItemList[i]:OnOpen(false, {Data.data.shows[i][1],Data.data.shows[i][2],Data.data.shows[i][3]}, 0.9,false,false,false,self.sortingOrder) self.ItemList[i].gameObject:SetActive(true) end + + --左右按钮红点检测 + if growData[DynamicActivityManager.Index - 1] then + for i = DynamicActivityManager.Index - 1, 1,-1 do + local curData = growData[i] + if curData.data.limitNum - curData.data.boughtNum > 0 and + BagManager.GetTotalItemNum(curData.data.costId) >= curData.data.price and + rechargeNum >= curData.data.shopItemData.BuyRule[2] then + self.leftRed:SetActive(true) + break + else + self.leftRed:SetActive(false) + end + end + end + if growData[DynamicActivityManager.Index + 1] then + for i = DynamicActivityManager.Index + 1, 14 do + local curData = growData[i] + if curData and curData.data.limitNum - curData.data.boughtNum > 0 and + BagManager.GetTotalItemNum(curData.data.costId) >= curData.data.price and + rechargeNum >= curData.data.shopItemData.BuyRule[2] then + self.rightRed:SetActive(true) + break + else + self.rightRed:SetActive(false) + end + end + end end --===============================通用礼包数据========================== diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua index b05b4cb218..9a1a2d8ee7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua @@ -41,6 +41,8 @@ function RechargeViewNew:InitComponent() self.cost = Util.GetGameObject(self.btnGet,"cost") self.btnText = Util.GetGameObject(self.btnGet,"Text") self.btnRed = Util.GetGameObject(self.btnGet,"red") + self.leftRed = Util.GetGameObject(self.btnLeft,"Red") + self.rightRed = Util.GetGameObject(self.btnRight,"Red") self.endTimeBg = Util.GetGameObject(self.gameObject,"growPack/Time") self.endTimeBg.gameObject:SetActive(false) self.ItemList = {} @@ -66,7 +68,7 @@ function RechargeViewNew:OnShow(_sortingOrder) self:SetGrowGift() end ---==============================成长礼包部分==========================(EveryDayGiftNew中有完全相同的部分,复制过去) +--==============================成长礼包部分==========================(rechargeViewNew和EveryDayGiftNew中有完全相同的部分,复制过去) function RechargeViewNew:SetGrowGift() growData = DynamicActivityManager.GetGiftDataByType({{2,20}}) local rechargeNum = VipManager.GetChargedNum()--已经充值的金额 @@ -156,7 +158,7 @@ function RechargeViewNew:RefreshReward(Data) Util.SetGray(self.btnGet, false) if rechargeNum >= Data.data.shopItemData.BuyRule[2] then self.btnGet:GetComponent("Image").sprite = self.spLoader:LoadSprite("s_slbz_1anniuongse") - if Data.data.shopItemData.BuyRule[2] == 0 then--只有零元档有红点 + if BagManager.GetTotalItemNum(Data.data.costId) >= Data.data.price then self.btnRed:SetActive(true) end else @@ -205,6 +207,34 @@ function RechargeViewNew:RefreshReward(Data) self.ItemList[i]:OnOpen(false, {Data.data.shows[i][1],Data.data.shows[i][2],Data.data.shows[i][3]}, 0.9,false,false,false,self.sortingOrder) self.ItemList[i].gameObject:SetActive(true) end + + --左右按钮红点检测 + if growData[DynamicActivityManager.Index - 1] then + for i = DynamicActivityManager.Index - 1, 1,-1 do + local curData = growData[i] + if curData.data.limitNum - curData.data.boughtNum > 0 and + BagManager.GetTotalItemNum(curData.data.costId) >= curData.data.price and + rechargeNum >= curData.data.shopItemData.BuyRule[2] then + self.leftRed:SetActive(true) + break + else + self.leftRed:SetActive(false) + end + end + end + if growData[DynamicActivityManager.Index + 1] then + for i = DynamicActivityManager.Index + 1, 14 do + local curData = growData[i] + if curData and curData.data.limitNum - curData.data.boughtNum > 0 and + BagManager.GetTotalItemNum(curData.data.costId) >= curData.data.price and + rechargeNum >= curData.data.shopItemData.BuyRule[2] then + self.rightRed:SetActive(true) + break + else + self.rightRed:SetActive(false) + end + end + end end function RechargeViewNew:OnClose()