Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
wangzhenxing 2021-11-27 16:35:13 +08:00
commit d099ddafa3
4 changed files with 38 additions and 30 deletions

View File

@ -294,13 +294,13 @@ MonoBehaviour:
m_BestFit: 0 m_BestFit: 0
m_MinSize: 0 m_MinSize: 0
m_MaxSize: 40 m_MaxSize: 40
m_Alignment: 3 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 1 m_HorizontalOverflow: 1
m_VerticalOverflow: 1 m_VerticalOverflow: 1
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: "\u4ECA\u65E5\u53EC\u5524\u4E0A\u9650\uFF1A1/9999999" m_Text:
LanguageIndex: 0 LanguageIndex: 0
--- !u!1 &1768094807205281071 --- !u!1 &1768094807205281071
GameObject: GameObject:
@ -862,7 +862,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {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_SizeDelta: {x: 512.98, y: 56.539978}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4453907170405986640 --- !u!1 &4453907170405986640

View File

@ -257,6 +257,8 @@ function this:OnSortingOrderChange()
orginLayer = this.sortingOrder orginLayer = this.sortingOrder
BattleView:OnSortingOrderChange(this.sortingOrder) BattleView:OnSortingOrderChange(this.sortingOrder)
this.UpRoot:GetComponent("Canvas").sortingOrder = this.sortingOrder + 10
this.DownRoot:GetComponent("Canvas").sortingOrder = this.sortingOrder + 10
end end
--界面打开时调用(用于子类重写) --界面打开时调用(用于子类重写)

View File

@ -78,7 +78,8 @@ function LingShowTeHui:OnShow(_sortingOrder,_parent)
end end
end end
self:OnShowData() self:OnShowData()
self:SetTime() self.time.text = "每周一零点刷新"
-- self:SetTime()
end end
local FrameSprite = { local FrameSprite = {
[3] = "l_lishoutehui_ziyuan", [3] = "l_lishoutehui_ziyuan",
@ -88,6 +89,7 @@ local FrameSprite = {
function LingShowTeHui:OnShowData() function LingShowTeHui:OnShowData()
local activityConfig = ConfigManager.GetConfigData(ConfigName.GlobalActivity,self.actId) local activityConfig = ConfigManager.GetConfigData(ConfigName.GlobalActivity,self.actId)
self.rechargeConfigId = activityConfig.CanBuyRechargeId[1] self.rechargeConfigId = activityConfig.CanBuyRechargeId[1]
LogGreen("self.rechargeConfigId:"..tostring(self.rechargeConfigId))
self.allData = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,self.rechargeConfigId) self.allData = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,self.rechargeConfigId)
self.buyBtnText.text = MoneyUtil.GetMoneyUnitNameWithMoney(self.allData.Price) self.buyBtnText.text = MoneyUtil.GetMoneyUnitNameWithMoney(self.allData.Price)
if not self.itemsGrid then if not self.itemsGrid then
@ -142,25 +144,25 @@ function LingShowTeHui:OnShowData()
end end
end end
function LingShowTeHui:SetTime() -- function LingShowTeHui:SetTime()
if self.timer then -- if self.timer then
self.timer:Stop() -- self.timer:Stop()
self.timer = nil -- self.timer = nil
end -- end
local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.LingShowTeHui) -- local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.LingShowTeHui)
local timeDown = endTime - GetTimeStamp() -- local timeDown = endTime - GetTimeStamp()
self.time.text = Language[10470]..TimeToDHMS(timeDown) -- self.time.text = "每周一零点刷新"--Language[10470]..TimeToDHMS(timeDown)
self.timer = Timer.New(function() -- self.timer = Timer.New(function()
timeDown = timeDown - 1 -- timeDown = timeDown - 1
if timeDown < 1 then -- if timeDown < 1 then
self.timer:Stop() -- self.timer:Stop()
self.timer = nil -- self.timer = nil
self.time.text = Language[10470]..TimeToDHMS(0) -- self.time.text = Language[10470]..TimeToDHMS(0)
end -- end
self.time.text = Language[10470]..TimeToDHMS(timeDown) -- self.time.text = Language[10470]..TimeToDHMS(timeDown)
end, 1, -1, true) -- end, 1, -1, true)
self.timer:Start() -- self.timer:Start()
end -- end
function LingShowTeHui:OnClose() function LingShowTeHui:OnClose()
self.spLoader:Destroy() self.spLoader:Destroy()

View File

@ -237,13 +237,17 @@ local TypeUpdateFunc = {
tempData.PackId = configData[j].PackId tempData.PackId = configData[j].PackId
tempData.Sort = configData[j].Sort tempData.Sort = configData[j].Sort
tempData.BuyDay = configData[j].BuyDay tempData.BuyDay = configData[j].BuyDay
tempData.Name = rechargeConfig[configData[j].PackId].Name if rechargeConfig[configData[j].PackId] then
tempData.Reward = rechargeConfig[configData[j].PackId].RewardShow tempData.Name = rechargeConfig[configData[j].PackId].Name
tempData.Price = rechargeConfig[configData[j].PackId].Price tempData.Reward = rechargeConfig[configData[j].PackId].RewardShow
tempData.progress = curData.rewards[i].progress tempData.Price = rechargeConfig[configData[j].PackId].Price
tempData.canBuy = OperatingManager.GetLeftBuyTime(5,tempData.PackId) tempData.progress = curData.rewards[i].progress
--插入数据2维 [天数][第几个] tempData.canBuy = OperatingManager.GetLeftBuyTime(5,tempData.PackId)
table.insert(curData.FreelyData[configData[j].Sort],tempData) --插入数据2维 [天数][第几个]
table.insert(curData.FreelyData[configData[j].Sort],tempData)
else
LogError("百宝商会Recharge表中未找到礼包Id:"..tostring(configData[j].PackId))
end
end end
end end
end end