diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/RedPacketView/RedPacketPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/RedPacketView/RedPacketPanel.prefab index 271d152bdf..df62460208 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/RedPacketView/RedPacketPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/RedPacketView/RedPacketPanel.prefab @@ -806,6 +806,8 @@ GameObject: - component: {fileID: 9183493092506596636} - component: {fileID: 4680263559291788476} - component: {fileID: 1713348630478564721} + - component: {fileID: 738113598} + - component: {fileID: 738113597} m_Layer: 5 m_Name: infoPanel m_TagString: Untagged @@ -912,6 +914,44 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!223 &738113598 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 536596799022685883} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 1 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 800 + m_TargetDisplay: 0 +--- !u!114 &738113597 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 536596799022685883} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 --- !u!1 &605440688170322811 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index 95d428d88e..332b23815f 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -293,13 +293,10 @@ function this.SetActivityInfo(type, Id, state) end end end - -function this.SetActivityInfoProgress(type, Id,state) - for _, missInfo in pairs(this.mission[type].mission) do - if missInfo.missionId == Id then - missInfo.state = state - break - end +--设置限时抽卡活动up英雄id +function this.SetActivityInfoRewardId(type,Id) + if this.mission[type] then + this.mission[type].choiceRewardId=Id end end diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendWealView.lua b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendWealView.lua index dae0085359..d44f5392eb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendWealView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendWealView.lua @@ -145,7 +145,7 @@ function this:ShowItemInfo(go,data) --显示红包信息 Util.AddOnceClick(go,function() this.infoObj.gameObject:SetActive(true) - this.numTxt.text=data.config.TotalMoney[1] + this.numTxt.text=data.config.Num this.sumTxt.text=data.config.TotalMoney[2] this.rewardImg.sprite=this.spLoader:LoadSprite(GetResourcePath(data.config.IconId)) end) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua index 10dfd05b3c..8f11c7286d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua @@ -29,6 +29,7 @@ function this:BindEvent() end) Util.AddClick(this.confirmBtn,function() NetManager.ChoiceHeroRewardRequest(args[1],currHeroId,function() + ActivityGiftManager.SetActivityInfoRewardId(args[1],currHeroId) Game.GlobalEvent:DispatchEvent(GameEvent.Activity.TimeLimitUpHeroChange,currHeroId) parent:ClosePanel() end) @@ -87,7 +88,6 @@ function this.SingleHeroDataShow(go,_heroData) Util.GetGameObject(_go.transform, "posIcon"):SetActive(false) Util.GetGameObject(_go.transform, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.PropertyName)) local starGrid = Util.GetGameObject(_go.transform, "star") - LogError("_heroData.Id==".._heroData.Id.." currid="..currHeroId) if _heroData.Id==currHeroId then this.selectObj.transform:SetParent(_go.transform) this.selectObj.transform.localScale=Vector3.one