diff --git a/src/server/game/Player.go b/src/server/game/Player.go index 7d639822..7a7ae56d 100644 --- a/src/server/game/Player.go +++ b/src/server/game/Player.go @@ -474,7 +474,10 @@ func (p *Player) HandleItem(itemList []*item.Item, Label string) error { ResCard := make([]*msg.CardPack, 0) ResItem := make([]*msg.ItemInfo, 0) ItemMod := p.PlayMod.getItemMod() - + AvatarMod := p.PlayMod.getAvatarMod() + EmojiMod := p.PlayMod.getEmojiMod() + FaceMod := p.PlayMod.getFaceMod() + BackDataType := map[int]struct{}{} for _, v := range itemList { if v.Num == 0 { continue @@ -625,14 +628,30 @@ func (p *Player) HandleItem(itemList []*item.Item, Label string) error { "piggy_bank_id": Effect, "income_from": Label, }) - case item.ITEM_TYPE_AVATAR: + case item.ITEM_TYPE_AVATAR: // 头像框 Effect := itemCfg.GetItemEffectList(v.Id) - AvatarMod := p.PlayMod.getAvatarMod() AvatarMod.Unlock(Effect[0], Effect[1]) p.TeLog("avatarIcon_income", map[string]interface{}{ "avatar_id": Effect[0], "income_from": Label, }) + BackDataType[item.ITEM_TYPE_AVATAR] = struct{}{} + case item.ITEM_TYPE_EMOJI: // 表情 + Effect := itemCfg.GetItemEffectList(v.Id) + EmojiMod.Unlock(Effect[0], Effect[1]) + p.TeLog("emoji_income", map[string]interface{}{ + "emoji_id": Effect[0], + "income_from": Label, + }) + BackDataType[item.ITEM_TYPE_EMOJI] = struct{}{} + case item.ITEM_TYPE_FACE: // 头像 + Effect := itemCfg.GetItemEffectList(v.Id) + FaceMod.Unlock(Effect[0], Effect[1]) + p.TeLog("face_income", map[string]interface{}{ + "face_id": Effect[0], + "income_from": Label, + }) + BackDataType[item.ITEM_TYPE_FACE] = struct{}{} case item.ITEM_TYPE_ACTIVITY_RACE: // 活动竞速 RaceMod := p.PlayMod.getRaceMod() RaceMod.AddCoin(v.Num) @@ -662,6 +681,14 @@ func (p *Player) HandleItem(itemList []*item.Item, Label string) error { Lable: Label, }) } + for k := range BackDataType { + switch k { + case item.ITEM_TYPE_AVATAR: + case item.ITEM_TYPE_EMOJI: + case item.ITEM_TYPE_FACE: + BackUserInfo(p) + } + } CardMod := p.PlayMod.getCardMod() p.PushClientRes(CardMod.NotifyCard()) p.PushClientRes(ItemMod.NotifyItem()) diff --git a/src/server/game/mod/item/Item.go b/src/server/game/mod/item/Item.go index 01fd26d6..8ce5d555 100644 --- a/src/server/game/mod/item/Item.go +++ b/src/server/game/mod/item/Item.go @@ -40,6 +40,8 @@ const ( ITEM_TYPE_ACTIVITY = 106 // 活动道具 ITEM_TYPE_ACTIVITY_RACE = 107 // 竞赛活动道具 ITEM_TYPE_PLAYROOM_VISIT = 108 // playroom拜访道具 + ITEM_TYPE_EMOJI = 109 // 表情 + ITEM_TYPE_FACE = 110 // 头像 ) func (i *ItemMod) InitData() {