diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopupNew.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopupNew.prefab index 008b5cd728..2cf01b0c6f 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopupNew.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopupNew.prefab @@ -93872,7 +93872,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8247836946986904715 RectTransform: m_ObjectHideFlags: 0 @@ -93891,7 +93891,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: 411.9, y: 742.7} + m_AnchoredPosition: {x: -411.9, y: 742.7} m_SizeDelta: {x: 193.26, y: 272.53} m_Pivot: {x: 0.5, y: 1} --- !u!222 &2702440278417571578 @@ -113871,10 +113871,10 @@ RectTransform: m_Father: {fileID: 4459097364279598307} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 20.5, y: -116.5} - m_SizeDelta: {x: 41, y: 41} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4461356243262728153 CanvasRenderer: @@ -114010,10 +114010,10 @@ RectTransform: m_Father: {fileID: 4459097364279598307} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 20.5, y: -84.5} - m_SizeDelta: {x: 41, y: 41} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4460867870177691501 CanvasRenderer: @@ -114084,10 +114084,10 @@ RectTransform: m_Father: {fileID: 4459097364279598307} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 20.5, y: -148.5} - m_SizeDelta: {x: 41, y: 41} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4461808864897362591 CanvasRenderer: @@ -114158,10 +114158,10 @@ RectTransform: m_Father: {fileID: 4459097364279598307} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 20.5, y: -52.5} - m_SizeDelta: {x: 41, y: 41} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4461618795857376309 CanvasRenderer: @@ -114232,10 +114232,10 @@ RectTransform: m_Father: {fileID: 4459097364279598307} 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: 20.5, y: -20.5} - m_SizeDelta: {x: 41, y: 41} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4461294795054865327 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index a079f8d9d4..3146320faf 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1184,6 +1184,8 @@ JumpType = { honglushop = 20274, fangcunxunbaoShop = 20275,--方寸寻宝 ContinuePackage = 20290,--连购礼包 + + tehuishangcheng = 18888,--特惠商城 } NPCPosType={ diff --git a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua index b342502546..40794332d1 100644 --- a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua @@ -96,6 +96,14 @@ function PremiumRebatePanel:Refresh(isTop,isAni) self.actData = ActivityGiftManager.GetActivityInfo(BTNS[curPage].actType) self.giftData = DynamicActivityManager.GetGiftDataByType({DataType.Direct,5,BTNS[curPage].showType}) self.actConfigData = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",BTNS[curPage].actType) + for i = 1,#self.actData.mission do + if self.actData.mission[self.actData.mission[1].progress].state == 1 then + self.leftTime.text = string.format("累计天数:%s/15",self.actData.mission[1].progress) + else + self.leftTime.text = string.format("累计天数:%s/15",self.actData.mission[1].progress - 1) + end + end + self:SetRewardShow(isTop,isAni) self:SetTime() end @@ -161,10 +169,6 @@ function PremiumRebatePanel:SetTime() end function PremiumRebatePanel:OnClose() - if self.timer then - self.timer:Stop() - self.timer = nil - end end --界面销毁时调用(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index f0b07c64c2..8018b5ee39 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -856,6 +856,9 @@ local jumpDic = { [JumpType.shenwaihuashen] = function(data,args) UIManager.OpenPanel(UIName.IncarnationPanel,data[1]) end, + [JumpType.tehuishangcheng] = function(data,args) + UIManager.OpenPanel(UIName.ActivityMainPanel,36) + end, } function this.JumpActivity(data,skipfactor)