diff --git a/src/server/game/ChargeFunc.go b/src/server/game/ChargeFunc.go index 9ee8e820..b535d95f 100644 --- a/src/server/game/ChargeFunc.go +++ b/src/server/game/ChargeFunc.go @@ -35,10 +35,17 @@ func SendCharge(p *Player, d *ChargeExtra) { func ADPetWorkFire(p *Player, ChargeId int) { ChargeMod := p.PlayMod.getChargeMod() - Item := ChargeMod.FireAd(ChargeId) + Item := ChargeMod.FireAdReward(ChargeId) if Item == nil { return } + err := p.HandleItem(Item, msg.ITEM_POP_LABEL_ActivityGift.String()) + if err != nil { + log.Debug("ChargeFire err : %s", err) + return + } + p.PlayMod.save() + p.PushClientRes(ChargeMod.BackData()) } func ActivityFire(p *Player, ChargeId int) { diff --git a/src/server/game/mod/charge/Charge.go b/src/server/game/mod/charge/Charge.go index 4c5c9016..05953ea0 100644 --- a/src/server/game/mod/charge/Charge.go +++ b/src/server/game/mod/charge/Charge.go @@ -181,6 +181,7 @@ func (c *ChargeMod) Fire(ChargeId int) (Item []*item.Item) { return } Item = c.FireGift(ChargeId) + c.FireAd(ChargeId) return } @@ -234,6 +235,16 @@ func (c *ChargeMod) FireGift(ChargeId int) []*item.Item { // 免广告礼包 func (c *ChargeMod) FireAd(ChargeId int) []*item.Item { + AdChargeId := chargeCfg.GetAdChargeId() + if ChargeId != AdChargeId { + return nil + } + c.Ad = true + return nil +} + +// 免广告礼包 +func (c *ChargeMod) FireAdReward(ChargeId int) []*item.Item { Items, PetWorkDay := chargeCfg.GetADReward(ChargeId) if PetWorkDay != 0 { Now := GoUtil.Now()