From b83dc76f7b77cc314472816cb2cc53a64621c30f Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Sat, 27 Nov 2021 15:30:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E7=81=B5=E5=85=BD=E7=89=B9?= =?UTF-8?q?=E6=83=A0=E3=80=91=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/DynamicActicity/page11.prefab | 6 +-- .../Modules/DynamicActivity/LingShowTeHui.lua | 42 ++++++++++--------- .../NewActivity/CommonActPageManager.lua | 18 ++++---- 3 files changed, 36 insertions(+), 30 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page11.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page11.prefab index bc347c4728..7bf3454bfb 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page11.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page11.prefab @@ -294,13 +294,13 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 0 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u4ECA\u65E5\u53EC\u5524\u4E0A\u9650\uFF1A1/9999999" + m_Text: LanguageIndex: 0 --- !u!1 &1768094807205281071 GameObject: @@ -862,7 +862,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: -6, y: 718} + m_AnchoredPosition: {x: -6, y: 723} m_SizeDelta: {x: 512.98, y: 56.539978} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4453907170405986640 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua index 0179b5419f..3589c85c66 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua @@ -78,7 +78,8 @@ function LingShowTeHui:OnShow(_sortingOrder,_parent) end end self:OnShowData() - self:SetTime() + self.time.text = "每周一零点刷新" + -- self:SetTime() end local FrameSprite = { [3] = "l_lishoutehui_ziyuan", @@ -88,6 +89,7 @@ local FrameSprite = { function LingShowTeHui:OnShowData() local activityConfig = ConfigManager.GetConfigData(ConfigName.GlobalActivity,self.actId) self.rechargeConfigId = activityConfig.CanBuyRechargeId[1] + LogGreen("self.rechargeConfigId:"..tostring(self.rechargeConfigId)) self.allData = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,self.rechargeConfigId) self.buyBtnText.text = MoneyUtil.GetMoneyUnitNameWithMoney(self.allData.Price) if not self.itemsGrid then @@ -142,25 +144,25 @@ function LingShowTeHui:OnShowData() end end -function LingShowTeHui:SetTime() - if self.timer then - self.timer:Stop() - self.timer = nil - end - local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.LingShowTeHui) - local timeDown = endTime - GetTimeStamp() - self.time.text = Language[10470]..TimeToDHMS(timeDown) - self.timer = Timer.New(function() - timeDown = timeDown - 1 - if timeDown < 1 then - self.timer:Stop() - self.timer = nil - self.time.text = Language[10470]..TimeToDHMS(0) - end - self.time.text = Language[10470]..TimeToDHMS(timeDown) - end, 1, -1, true) - self.timer:Start() -end +-- function LingShowTeHui:SetTime() +-- if self.timer then +-- self.timer:Stop() +-- self.timer = nil +-- end +-- local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.LingShowTeHui) +-- local timeDown = endTime - GetTimeStamp() +-- self.time.text = "每周一零点刷新"--Language[10470]..TimeToDHMS(timeDown) +-- self.timer = Timer.New(function() +-- timeDown = timeDown - 1 +-- if timeDown < 1 then +-- self.timer:Stop() +-- self.timer = nil +-- self.time.text = Language[10470]..TimeToDHMS(0) +-- end +-- self.time.text = Language[10470]..TimeToDHMS(timeDown) +-- end, 1, -1, true) +-- self.timer:Start() +-- end function LingShowTeHui:OnClose() self.spLoader:Destroy() diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index 212916352b..71f7013877 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -237,13 +237,17 @@ local TypeUpdateFunc = { tempData.PackId = configData[j].PackId tempData.Sort = configData[j].Sort tempData.BuyDay = configData[j].BuyDay - tempData.Name = rechargeConfig[configData[j].PackId].Name - tempData.Reward = rechargeConfig[configData[j].PackId].RewardShow - tempData.Price = rechargeConfig[configData[j].PackId].Price - tempData.progress = curData.rewards[i].progress - tempData.canBuy = OperatingManager.GetLeftBuyTime(5,tempData.PackId) - --插入数据2维 [天数][第几个] - table.insert(curData.FreelyData[configData[j].Sort],tempData) + if rechargeConfig[configData[j].PackId] then + tempData.Name = rechargeConfig[configData[j].PackId].Name + tempData.Reward = rechargeConfig[configData[j].PackId].RewardShow + tempData.Price = rechargeConfig[configData[j].PackId].Price + tempData.progress = curData.rewards[i].progress + tempData.canBuy = OperatingManager.GetLeftBuyTime(5,tempData.PackId) + --插入数据2维 [天数][第几个] + table.insert(curData.FreelyData[configData[j].Sort],tempData) + else + LogError("百宝商会:Recharge表中未找到礼包Id:"..tostring(configData[j].PackId)) + end end end end From 58ce5ad4d8d0f6ae5cd60d2d8c2843f70400868a Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sat, 27 Nov 2021 16:28:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=88=98=E6=96=97=E8=B7=B3=E8=BF=87=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E9=81=AE=E6=8C=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Test/BattleTestPanel.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Test/BattleTestPanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Test/BattleTestPanel.lua index 8f662ba9dd..8bd5337d1f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Test/BattleTestPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Test/BattleTestPanel.lua @@ -257,6 +257,8 @@ function this:OnSortingOrderChange() orginLayer = this.sortingOrder BattleView:OnSortingOrderChange(this.sortingOrder) + this.UpRoot:GetComponent("Canvas").sortingOrder = this.sortingOrder + 10 + this.DownRoot:GetComponent("Canvas").sortingOrder = this.sortingOrder + 10 end --界面打开时调用(用于子类重写)