1.修复发射器在背包生成订单奖励的bug;2.修复回收订单退役发射器判断错误的bug

This commit is contained in:
hahwu 2026-03-11 15:12:48 +08:00
parent 2d0af7a2af
commit 50aa304ff1
2 changed files with 29 additions and 2 deletions

View File

@ -300,6 +300,19 @@ func (cb *ChessBorad) emitListToSlice(retireFilter bool) []int {
} }
EM[EmitID] = max(EM[EmitID], k) EM[EmitID] = max(EM[EmitID], k)
} }
for _, v := range cb.ChessBag.List {
EmitID := mergeDataCfg.GetEmitId(v.ChessId)
if EmitID == "" {
continue
}
if retireFilter && cb.Retire[EmitID] >= EMIT_RETIRE_START {
continue
}
if mergeDataCfg.GetEmitType(v.ChessId) == "sub" {
continue
}
EM[EmitID] = max(EM[EmitID], (v.ChessId))
}
result := make([]int, 0, len(EM)) result := make([]int, 0, len(EM))
for _, v := range EM { for _, v := range EM {
result = append(result, v) result = append(result, v)
@ -729,8 +742,8 @@ func (cb *ChessBorad) GetRetireReward(Id string) ([]*item.Item, error) {
func (cb *ChessBorad) GetRetireProduceColor() []string { func (cb *ChessBorad) GetRetireProduceColor() []string {
color := make([]string, 0, len(cb.Retire)) color := make([]string, 0, len(cb.Retire))
for k, v := range cb.Retire { for k, v := range cb.Retire {
if v == EMIT_RETIRE_ING { if v >= EMIT_RETIRE_ING {
color = append(color, mergeDataCfg.GetEmitTypeByColor(k)) color = append(color, mergeDataCfg.GetEmitProduce(k)...)
} }
} }
return color return color

View File

@ -52,3 +52,17 @@ func TestInitOrderItem(t *testing.T) {
p1.InitOrderItem() p1.InitOrderItem()
fmt.Printf("order item:%v", OrderMod.OrderList[1].Items) fmt.Printf("order item:%v", OrderMod.OrderList[1].Items)
} }
func TestHighOrder(t *testing.T) {
p1 := new(game.Player)
p1.InitPlayer("3625212")
OrderMod := p1.GetOrderMod()
OrderMod.OrderList = make(map[int]order.Order)
OrderMod.OrderList[1] = order.Order{
MergeId: []int{1346},
}
p1.AddHighOrder()
p1.AddHighOrder2()
p1.InitOrderItem()
fmt.Printf("order item:%v", OrderMod.OrderList[1].Items)
}