diff --git a/Assets/ManagedResources/Prefabs/UI/GoodFriend/GoodFriendMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/GoodFriend/GoodFriendMainPanel.prefab index 8303ea73b5..61dc31e9fe 100644 --- a/Assets/ManagedResources/Prefabs/UI/GoodFriend/GoodFriendMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GoodFriend/GoodFriendMainPanel.prefab @@ -3907,6 +3907,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &2551664916989814864 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2985278051641447754} + - component: {fileID: 6266349407302548147} + - component: {fileID: 1991152821217593675} + m_Layer: 5 + m_Name: GetAllRed + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2985278051641447754 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2551664916989814864} + 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: 1} + m_Children: [] + m_Father: {fileID: 1949135153781524357} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -27, y: -5} + m_SizeDelta: {x: 26, y: 26} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6266349407302548147 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2551664916989814864} + m_CullTransparentMesh: 0 +--- !u!114 &1991152821217593675 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2551664916989814864} + 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 &2575422294079211815 GameObject: m_ObjectHideFlags: 0 @@ -3938,6 +4012,7 @@ RectTransform: m_Children: - {fileID: 18445251941216506} - {fileID: 6951220316431824282} + - {fileID: 3595179654821898819} m_Father: {fileID: 3217785936302008136} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4464,7 +4539,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3595179654821898819 RectTransform: m_ObjectHideFlags: 0 @@ -4476,12 +4551,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 3846062141729905751} - m_RootOrder: 8 + m_Father: {fileID: 1682470200488907665} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 162, y: 100} + m_AnchoredPosition: {x: 63.01245, y: 117.930664} m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4448825418863158884 @@ -6696,6 +6771,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6566627144559444393} + - {fileID: 2985278051641447754} m_Father: {fileID: 7293695097453849688} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -8078,6 +8154,7 @@ RectTransform: m_Children: - {fileID: 7464680264057658127} - {fileID: 2175286276138528} + - {fileID: 7493785393343189389} m_Father: {fileID: 3217785936302008136} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -8630,7 +8707,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7493785393343189389 RectTransform: m_ObjectHideFlags: 0 @@ -8642,12 +8719,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 3846062141729905751} - m_RootOrder: 9 + m_Father: {fileID: 2971477452682069534} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 6, y: 100} + m_AnchoredPosition: {x: 62.01248, y: 117.930664} m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &133334246801982772 @@ -8892,8 +8969,6 @@ RectTransform: - {fileID: 3217785936302008136} - {fileID: 2911906638405515869} - {fileID: 53550464877346762} - - {fileID: 3595179654821898819} - - {fileID: 7493785393343189389} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 50a5a923fd..23e3bcc26e 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -722,6 +722,7 @@ RedPointType = { SecretTer_FindTreasure=1093, --- 好友红点 ----- Friend_Reward = 2301, -- 好友赠送体力红点 + Friend_GetAllReward = 23011,--一键领取 Friend_Application = 2302, -- 好友申请红点 --- 设置界面红点 ---- Setting_Head = 2311, diff --git a/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendMainPanel.lua index 1f157aca9f..4ea0851387 100644 --- a/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendMainPanel.lua @@ -81,8 +81,9 @@ function GoodFriendMainPanel:InitComponent() this.ScrollView4.moveTween.MomentumAmount = 1 this.ScrollView4.moveTween.Strength = 2 - this.friendApplicationRedPoint = Util.GetGameObject(self.gameObject, "friendApplicationRedPoint") - this.friendListRedPoint = Util.GetGameObject(self.gameObject, "friendListRedPoint") + this.friendApplicationRedPoint = Util.GetGameObject(self.gameObject, "switchBtn/friendApplicationBtn/friendApplicationRedPoint") + this.friendListRedPoint = Util.GetGameObject(self.gameObject, "switchBtn/friendListBtn/friendListRedPoint") + this.getAllRedPoint = Util.GetGameObject(self.gameObject, "friendList/bottomImage/receiveBtn/GetAllRed") end @@ -189,6 +190,7 @@ function GoodFriendMainPanel:BindEvent() -- 绑定红点 BindRedPointObject(RedPointType.Friend_Reward, this.friendListRedPoint) + BindRedPointObject(RedPointType.Friend_GetAllReward,this.getAllRedPoint) BindRedPointObject(RedPointType.Friend_Application, this.friendApplicationRedPoint) end @@ -323,6 +325,7 @@ function GoodFriendMainPanel:OnDestroy() --SubUIManager.Close(this.BtView) --SubUIManager.Close(this.BtView2) ClearRedPointObject(RedPointType.Friend_Reward, this.friendListRedPoint) + ClearRedPointObject(RedPointType.Friend_GetAllReward,this.getAllRedPoint) ClearRedPointObject(RedPointType.Friend_Application, this.friendApplicationRedPoint) this.ScrollView1 = nil this.ScrollView2 = nil @@ -332,7 +335,7 @@ end --好友列表循环滚动数据 function GoodFriendMainPanel:FriendListDataShow() - CheckRedPointStatus(RedPointType.Friend_Reward) + CheckRedPointStatus(RedPointType.Friend_GetAllReward) this:OnRefreshData() local list = {} local j = 1 diff --git a/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua b/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua index 9923da520b..64d987cab9 100644 --- a/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua @@ -60,7 +60,7 @@ function this.OnRefreshEnegryData() this.MaxEnergyGet = PrivilegeManager.GetPrivilegeRemainValue(GameSetting[1].MaxEnergyGet) this.MaxEngery = PrivilegeManager.GetPrivilegeNumber(GameSetting[1].MaxEnergyGet) Game.GlobalEvent:DispatchEvent(GameEvent.Friend.OnFriendList, this.friendAllData) - CheckRedPointStatus(RedPointType.Friend_Reward) + CheckRedPointStatus(RedPointType.Friend_GetAllReward) end --跨天刷新 @@ -72,7 +72,7 @@ function this.OnRefreshDataNextDay() v.haveReward = 0 end Game.GlobalEvent:DispatchEvent(GameEvent.Friend.OnFriendList, this.friendAllData) - CheckRedPointStatus(RedPointType.Friend_Reward) + CheckRedPointStatus(RedPointType.Friend_GetAllReward) end --添加申请好友数据刷新 diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua index b42a22a586..08c0affdb6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua @@ -300,7 +300,7 @@ function this.ReceiveFriendApplication(buffer) Game.GlobalEvent:DispatchEvent(GameEvent.Friend.OnFriendApplication, GoodFriendManager.friendApplicationData) end CheckRedPointStatus(RedPointType.Friend_Application) - CheckRedPointStatus(RedPointType.Friend_Reward) + CheckRedPointStatus(RedPointType.Friend_GetAllReward) end -- 接收服务器好友删除,赠送体力推送 @@ -316,7 +316,7 @@ function this.ReceiveFriendDeleteState(buffer) if (msg.type == 2) then GoodFriendManager.friendAllData[msg.friendId].haveReward = 1 end - CheckRedPointStatus(RedPointType.Friend_Reward) + CheckRedPointStatus(RedPointType.Friend_GetAllReward) Game.GlobalEvent:DispatchEvent(GameEvent.Friend.OnFriendList, GoodFriendManager.friendAllData) end diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 44213adab1..ed9c040972 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -190,6 +190,7 @@ function this.InitRedPointAllRelate() RPData:SetParent(RedPointType.PoZhenZhuXianTask, RedPointType.DynamicActivity) -- 好友红点 + RPData:SetParent(RedPointType.Friend_GetAllReward, RedPointType.Friend_Reward) RPData:SetParent(RedPointType.Friend_Reward, RedPointType.Friend) RPData:SetParent(RedPointType.Friend_Application, RedPointType.Friend) -- 设置界面红点 @@ -296,7 +297,7 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.Refining_Weapon, WorkShopManager.GetWorkShopRedPointState) RPData:AddCheckFunc(RedPointType.Refining_Armor, WorkShopManager.GetWorkShopRedPointState) --好友 - RPData:AddCheckFunc(RedPointType.Friend_Reward, GoodFriendManager.FriendRewardRedPointShow,FUNCTION_OPEN_TYPE.GOODFRIEND) + RPData:AddCheckFunc(RedPointType.Friend_GetAllReward, GoodFriendManager.FriendRewardRedPointShow,FUNCTION_OPEN_TYPE.GOODFRIEND) RPData:AddCheckFunc(RedPointType.Friend_Application, GoodFriendManager.FriendApplicationRedPointShow,FUNCTION_OPEN_TYPE.GOODFRIEND) --秘境 RPData:AddCheckFunc(RedPointType.SecretTer_MaxBoxReward, AdventureManager.BoxMaxReward,FUNCTION_OPEN_TYPE.ADVENTURE)