diff --git a/src/server/GoUtil/sliceUtil.go b/src/server/GoUtil/sliceUtil.go index a84132aa..194db286 100644 --- a/src/server/GoUtil/sliceUtil.go +++ b/src/server/GoUtil/sliceUtil.go @@ -160,6 +160,17 @@ func PopElemSlice(s []int, Id int) ([]int, bool) { return s, false } +func PopStringElemSlice(s0 []string, Id string) ([]string, bool) { + s := make([]string, len(s0)) + copy(s, s0) + for k, v := range s { + if v == Id { + return append(s[0:k], s[k+1:]...), true + } + } + return s, false +} + func ElemInSlice(s []int, Id int) bool { for _, v := range s { if v == Id { diff --git a/src/server/game/mod/order/Order.go b/src/server/game/mod/order/Order.go index 5581041a..67e274ec 100644 --- a/src/server/game/mod/order/Order.go +++ b/src/server/game/mod/order/Order.go @@ -124,6 +124,12 @@ func (o *OrderMod) RewardOrder(id int) ([]*item.Item, []int, int, int, error) { return nil, v.MergeId, v.Type, 0, nil } if v.Type == Fixed_type || v.Type == Playroom_type { + if id == 78 { + o.AutoEmit, _ = GoUtil.PopStringElemSlice(o.AutoEmit, "D") + } + if id == 79 { + o.AutoEmit, _ = GoUtil.PopStringElemSlice(o.AutoEmit, "I") + } o.FinishOrder = append(o.FinishOrder, id) } return ItemList, v.MergeId, v.Type, Star, nil