From c66b3230443c1edce0174ccf8baf593bcd9a7a2e Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 12 May 2021 21:05:36 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=B4=BB=E5=8A=A8=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=91=E6=88=90=E9=95=BF=E7=A4=BC=E5=8C=85banner=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2=E5=8F=8A=E8=B7=B3=E8=BD=AC=E5=A2=9E=E5=8A=A0=E6=B5=81?= =?UTF-8?q?=E5=85=89=E7=89=B9=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/NewActivity/EveryDayGift.prefab | 302 +++++++++++++++++- .../~Lua/Modules/Main/MainPanel.lua | 2 +- .../Modules/Recharge/View/EveryDayGift.lua | 29 ++ 3 files changed, 331 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGift.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGift.prefab index 261e796ae4..b0bc25c128 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGift.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGift.prefab @@ -4712,6 +4712,80 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!1 &460685693485688084 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2473084812374018557} + - component: {fileID: 1137649762887324550} + - component: {fileID: 4042461225843518350} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2473084812374018557 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 460685693485688084} + 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: 1207664692133758490} + m_RootOrder: 0 + 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: 0, y: 274.3} + m_SizeDelta: {x: 1080, y: 1920} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1137649762887324550 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 460685693485688084} + m_CullTransparentMesh: 0 +--- !u!114 &4042461225843518350 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 460685693485688084} + 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: a2405fced91d3d443befb9c81440a05b, 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 &929994369376810155 GameObject: m_ObjectHideFlags: 0 @@ -5055,6 +5129,64 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &1899051213765517796 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 949487425371930093} + - component: {fileID: 3395866400938579454} + - component: {fileID: 280608162441461543} + m_Layer: 5 + m_Name: curObj1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &949487425371930093 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1899051213765517796} + 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: 9101071781219648697} + m_Father: {fileID: 1272852733815832172} + 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: 0.02002, y: 118.43} + m_SizeDelta: {x: 221.93, y: 527.26} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3395866400938579454 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1899051213765517796} + m_CullTransparentMesh: 0 +--- !u!114 &280608162441461543 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1899051213765517796} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &3354018833361181709 GameObject: m_ObjectHideFlags: 0 @@ -5168,6 +5300,78 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4088701415815430538 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9101071781219648697} + - component: {fileID: 1577754579559616713} + - component: {fileID: 6610950505966997431} + m_Layer: 5 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9101071781219648697 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4088701415815430538} + 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: 949487425371930093} + m_RootOrder: 0 + 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: 0, y: 0} + m_SizeDelta: {x: 640, y: 960} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1577754579559616713 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4088701415815430538} + m_CullTransparentMesh: 0 +--- !u!114 &6610950505966997431 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4088701415815430538} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 1c334a3cabb792e4097c5cc6ef40de17, type: 2} + m_Color: {r: 1, g: 1, b: 1, 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_Texture: {fileID: 8400000, guid: af10186367c1690418d1010bae399c18, type: 2} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &4363160613285279899 GameObject: m_ObjectHideFlags: 0 @@ -20875,6 +21079,55 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7394910266583111265 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1207664692133758490} + - component: {fileID: 351956857630950394} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1207664692133758490 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7394910266583111265} + 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: 2473084812374018557} + m_Father: {fileID: 1272852733815832172} + 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: 0, y: -272.3} + m_SizeDelta: {x: 1080, y: 1375.2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &351956857630950394 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7394910266583111265} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &7410245404359298878 GameObject: m_ObjectHideFlags: 0 @@ -21172,7 +21425,7 @@ RectTransform: - {fileID: 4152759531257861743} - {fileID: 4771312625141087135} m_Father: {fileID: 1272852733815832172} - m_RootOrder: 1 + 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} @@ -21328,6 +21581,50 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &8040283323955352384 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7863240148044703641} + - component: {fileID: 1589219876351663004} + m_Layer: 5 + m_Name: curObj + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7863240148044703641 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8040283323955352384} + 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: 1272852733815832172} + m_RootOrder: 2 + 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: 158, y: 59} + m_SizeDelta: {x: 763, y: 1000} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1589219876351663004 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8040283323955352384} + m_CullTransparentMesh: 0 --- !u!1 &8157925676028595395 GameObject: m_ObjectHideFlags: 0 @@ -21357,6 +21654,9 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7410245405657339441} + - {fileID: 949487425371930093} + - {fileID: 7863240148044703641} + - {fileID: 1207664692133758490} - {fileID: 3673471341400026499} m_Father: {fileID: 0} m_RootOrder: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index afd0fffb3d..c21ec86b3c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -335,7 +335,7 @@ function this:BindEvent() --六星前往 Util.AddClick(this.btnSixStarGo,function() --PlayerManager.isSixStarJump=true - DynamicActivityManager.SetSelectIndex(DataType.Shop,{1107}) + DynamicActivityManager.SetSelectIndex(DataType.Shop,{1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1111,1112,1113,1114}) JumpManager.GoJump(36011) end) diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua index b54221a709..bac791dc50 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua @@ -8,6 +8,7 @@ function EveryDayGift:New(gameObject) return b end +local heroId = 10026 --添加事件监听(用于子类重写) function EveryDayGift:AddListener() @@ -66,6 +67,8 @@ function EveryDayGift:InitComponent() self.scrollView.moveTween.Strength = 2 self.ItemList = {} self.sortingOrder = 0 + self.curObjPar = Util.GetGameObject(self.gameObject,"curObj") + self.rectMask = Util.GetGameObject(self.gameObject,"GameObject") end function EveryDayGift:BindEvent() @@ -136,9 +139,28 @@ function EveryDayGift:OnShow(_sortingOrder) VipManager.SetGrowthPackagePointStatus() CheckRedPointStatus(RedPointType.GrowthPackage) end + --self:RefreshBanner() self:RefreshData(true,true,true) end +function EveryDayGift:RefreshBanner() + LogGreen("self.actType:"..self.actType) + if self.actType == 96 then + self.curObjPar.gameObject:SetActive(true) + self.rectMask .gameObject:SetActive(true) + local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig,heroId) + if not self.curLiveObj then + self.curLiveObj = poolManager:LoadLive(GetResourcePath(heroConfig.Live), self.curObjPar.transform, + Vector3.one * heroConfig.Scale, Vector3.New(heroConfig.Position[1], heroConfig.Position[2], 0)) + local SkeletonGraphic = self.curLiveObj:GetComponent("SkeletonGraphic") + SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true) + end + else + self.curObjPar.gameObject:SetActive(false) + self.rectMask .gameObject:SetActive(false) + end +end + function EveryDayGift:RefreshData(isUpdata,isTop,isAni) if self.actConfig.RpType > 0 then CheckRedPointStatus(self.actConfig.RpType) @@ -318,6 +340,8 @@ function EveryDayGift:OnClose() self.localTimer = nil end self.gameObject:SetActive(false) + self.curObjPar.gameObject:SetActive(false) + self.rectMask.gameObject:SetActive(false) end function EveryDayGift:OnDestroy() @@ -333,6 +357,11 @@ function EveryDayGift:OnDestroy() self.localTimer:Stop() self.localTimer = nil end + if self.curLiveObj then + poolManager:UnLoadLive(self.curLiveObj.name, self.curLiveObj) + self.curLiveObj = nil + end + Util.ClearChild(self.curObjPar.transform) end --特权商城专属