猫猫回礼奖励聚合
This commit is contained in:
parent
4fd3ef80d7
commit
85a5273c10
@ -202,9 +202,9 @@ func (p *Player) CatReturnGiftZeroUpdate() {
|
|||||||
if cfg != nil {
|
if cfg != nil {
|
||||||
for _, v := range cfg.RewardList {
|
for _, v := range cfg.RewardList {
|
||||||
if oldScore >= int(v.Total) && oldReward < int(v.Id) {
|
if oldScore >= int(v.Total) && oldReward < int(v.Id) {
|
||||||
items = append(items, item.MsgToItem(v.Reward)...)
|
items = item.Merge(items, item.MsgToItem(v.Reward))
|
||||||
if v.StarReward > 0 {
|
if v.StarReward > 0 {
|
||||||
items = append(items, item.NewItem(item.ITEM_STAR_ID, GoUtil.FormatStarItemNum(int(v.StarReward), p.GetOrderFactor())))
|
items = item.Merge(items, []*item.Item{item.NewItem(item.ITEM_STAR_ID, GoUtil.FormatStarItemNum(int(v.StarReward), p.GetOrderFactor()))})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -5016,10 +5016,10 @@ func ReqCatReturnGiftReward(player *Player, req *msg.ReqCatReturnGiftReward) err
|
|||||||
var maxRewardId int
|
var maxRewardId int
|
||||||
for _, v := range cfg.RewardList {
|
for _, v := range cfg.RewardList {
|
||||||
if score >= int(v.Total) && reward < int(v.Id) {
|
if score >= int(v.Total) && reward < int(v.Id) {
|
||||||
items = append(items, item.MsgToItem(v.Reward)...)
|
items = item.Merge(items, item.MsgToItem(v.Reward))
|
||||||
maxRewardId = max(maxRewardId, int(v.Id))
|
maxRewardId = max(maxRewardId, int(v.Id))
|
||||||
if v.StarReward > 0 {
|
if v.StarReward > 0 {
|
||||||
items = append(items, item.NewItem(item.ITEM_STAR_ID, GoUtil.FormatStarItemNum(int(v.StarReward), player.GetOrderFactor())))
|
items = item.Merge(items, []*item.Item{item.NewItem(item.ITEM_STAR_ID, GoUtil.FormatStarItemNum(int(v.StarReward), player.GetOrderFactor()))})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user