活动通行证更新

This commit is contained in:
hahwu 2025-10-20 16:49:02 +08:00
parent 702d216a06
commit 780a2150fb

View File

@ -27,7 +27,7 @@ func ActivityLogin(p *Player) {
ItemNum := ItemMod.GetItem(ItemId) ItemNum := ItemMod.GetItem(ItemId)
if ItemNum != 0 { if ItemNum != 0 {
ItemMod.AddItem(ItemId, -ItemNum) ItemMod.AddItem(ItemId, -ItemNum)
SendActivityMail(p, ItemId, ItemNum, ActivityId) SendActivityMail(p, ItemId, ItemNum, ActivityId, nil)
} }
} }
// 猜颜色 // 猜颜色
@ -39,7 +39,7 @@ func ActivityLogin(p *Player) {
ItemNum := ItemMod.GetItem(ItemId) ItemNum := ItemMod.GetItem(ItemId)
if ItemNum != 0 { if ItemNum != 0 {
ItemMod.AddItem(ItemId, -ItemNum) ItemMod.AddItem(ItemId, -ItemNum)
SendActivityMail(p, ItemId, ItemNum, ActivityId) SendActivityMail(p, ItemId, ItemNum, ActivityId, nil)
} }
} }
@ -52,22 +52,38 @@ func ActivityLogin(p *Player) {
ItemNum := ItemMod.GetItem(ItemId) ItemNum := ItemMod.GetItem(ItemId)
if ItemNum != 0 { if ItemNum != 0 {
ItemMod.AddItem(ItemId, -ItemNum) ItemMod.AddItem(ItemId, -ItemNum)
SendActivityMail(p, ItemId, ItemNum, ActivityId) SendActivityMail(p, ItemId, ItemNum, ActivityId, nil)
}
}
// 通行证
ActivityId = GetActivityId(p, activity.ACT_TYPE_PASS)
PassMod := p.PlayMod.getPassMod()
OldId = PassMod.Login(ActivityId)
if OldId != 0 {
ItemId := passCfg.GetActivityItemId(OldId)
ItemNum := PassMod.Num
RewardItems, _ := PassMod.GetRewardItems()
if ItemNum != 0 {
ItemMod.AddItem(ItemId, -ItemNum)
SendActivityMail(p, ItemId, ItemNum, ActivityId, RewardItems)
} }
} }
} }
func SendActivityMail(p *Player, ItemId, ItemNum, ActivityId int) { func SendActivityMail(p *Player, ItemId, ItemNum, ActivityId int, RewardItems []*item.Item) {
MailMod := p.PlayMod.getMailMod() MailMod := p.PlayMod.getMailMod()
ItemName, ItemNameEn := itemCfg.GetItemName(ItemId) ItemName, ItemNameEn := itemCfg.GetItemName(ItemId)
ActivityTitle, ActivityTitleEn := activityCfg.GetActivityTitle(ActivityId) ActivityTitle, ActivityTitleEn := activityCfg.GetActivityTitle(ActivityId)
mt, mc, mt_en, mc_en := mailCfg.GetRecallMail(ActivityTitle, ActivityTitleEn, ItemName, ItemNameEn) mt, mc, mt_en, mc_en := mailCfg.GetRecallMail(ActivityTitle, ActivityTitleEn, ItemName, ItemNameEn)
Items := []*item.Item{item.NewItem(ItemId, ItemNum)} Items := []*item.Item{item.NewItem(ItemId, ItemNum)}
Items = append(Items, RewardItems...)
MailMod.Send(mt, "", mc, mt_en, "", mc_en, Items, mail.MAIL_TYPE_NORMAL) MailMod.Send(mt, "", mc, mt_en, "", mc_en, Items, mail.MAIL_TYPE_NORMAL)
} }
// 活动模块 零点更新 // 活动模块 零点更新
func ActivityZeroUpdate(p *Player) { func ActivityZeroUpdate(p *Player) {
ActivityLogin(p)
ActivityInfo := GetActivityInfo(p, activity.ACT_TYPE_MINING) ActivityInfo := GetActivityInfo(p, activity.ACT_TYPE_MINING)
if ActivityInfo != nil { if ActivityInfo != nil {
MiningMod := p.PlayMod.getMiningMod() MiningMod := p.PlayMod.getMiningMod()