Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

jiaoyangna 2020-09-07 15:50:50 +08:00
commit c981f24ed0
7 changed files with 16 additions and 12 deletions

View File

@ -454,8 +454,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -6.0999756, y: -509.8}
m_SizeDelta: {x: -428.2, y: 684.5}
m_AnchoredPosition: {x: 0, y: -509.8}
m_SizeDelta: {x: -300, y: 684.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1066462919
MonoBehaviour:

View File

@ -61,7 +61,10 @@ end
function EightDayGiftPanel:Refresh()
rewardData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.EightDayGift)
curDay = math.ceil((CalculateSecondsNowTo_N_OClock(24) + GetTimeStamp() - PlayerManager.userCreateTime)/86400)
curDay = math.ceil((CalculateSecondsNowTo_N_OClock(5) + GetTimeStamp() - PlayerManager.userCreateTime)/86400)
-- LogYellow((CalculateSecondsNowTo_N_OClock(5) + GetTimeStamp() - PlayerManager.userCreateTime)/86400)
-- LogGreen((CalculateSecondsNowTo_N_OClock(24) + GetTimeStamp() - PlayerManager.userCreateTime)/86400)
if curDay>8 then
curDay = 8
end
@ -255,7 +258,7 @@ function EightDayGiftPanel:SetRemainTime(day,i)
end
if not self.localTimer then
self.localTimer = Timer.New(function ()
local t = CalculateSecondsNowTo_N_OClock(24)
local t = CalculateSecondsNowTo_N_OClock(5)
if t-1 < 0 then
Timer.New(function()
poolManager:UnLoadLive(bgName, Live)

View File

@ -120,7 +120,7 @@ end
--添加事件监听(用于子类重写)
function TrialMapPanel:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.TrialMap.OnPowerValueChanged, this.OnPowerValueChange)
Game.GlobalEvent:AddEvent(GameEvent.Bag.OnTempBagChanged, this.OnTempBagChanged)
-- Game.GlobalEvent:AddEvent(GameEvent.Bag.OnTempBagChanged, this.OnTempBagChanged)
Game.GlobalEvent:AddEvent(GameEvent.FoodBuff.OnFoodBuffStateChanged, this.InitBuffInfo)
Game.GlobalEvent:AddEvent(GameEvent.Map.ShowEnemyInfo, this.ShowEnemyInfo)
Game.GlobalEvent:AddEvent(GameEvent.Map.RefreshHeroHp, this.SetSelectHero)
@ -131,7 +131,7 @@ end
--移除事件监听(用于子类重写)
function TrialMapPanel:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.TrialMap.OnPowerValueChanged, this.OnPowerValueChange)
Game.GlobalEvent:RemoveEvent(GameEvent.Bag.OnTempBagChanged, this.OnTempBagChanged)
-- Game.GlobalEvent:RemoveEvent(GameEvent.Bag.OnTempBagChanged, this.OnTempBagChanged)
Game.GlobalEvent:RemoveEvent(GameEvent.FoodBuff.OnFoodBuffStateChanged, this.InitBuffInfo)
Game.GlobalEvent:RemoveEvent(GameEvent.Map.ShowEnemyInfo, this.ShowEnemyInfo)
Game.GlobalEvent:RemoveEvent(GameEvent.Map.RefreshHeroHp, this.SetSelectHero)
@ -339,12 +339,12 @@ function this.InitTrialMission()
end
-- 刷新临时背包数据
function this.OnTempBagChanged()
if CarbonManager.difficulty == 2 then
this.RefreshBombNum()
end
end
-- -- 刷新临时背包数据
-- function this.OnTempBagChanged()
-- if CarbonManager.difficulty == 2 then
-- this.RefreshBombNum()
-- end
-- end
-- 刷新砸炸弹、回春散数量
function this.RefreshBombNum()

View File

@ -223,6 +223,7 @@ function QuickCommonPurchasePart:OnConfirmBtnClicked()
end
ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP, purChaseTypeIdDef[self.context.type], self.buyCountValue, function()
self.mainPanel:ClosePanel()
Game.GlobalEvent:DispatchEvent(GameEvent.Bag.OnTempBagChanged)
end)
end