修复从缓冲区生成的回收订单协议报错的问题
This commit is contained in:
parent
aa7ee2a381
commit
ed981184d3
@ -563,20 +563,20 @@ func (o *OrderMod) CreateExtraOrder(AddChess, AddNewEmit, ChessList []int, Energ
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
b3 := false
|
b3 := false
|
||||||
//额外订单补充2;当玩家的棋盘中出现三个相同的满级产物时,立刻生成一个对应的收购订单;
|
//额外订单补充2;当玩家的棋盘中出现2个相同的满级产物时,立刻生成一个对应的收购订单;
|
||||||
for k := range MaxLvChess {
|
for k := range MaxLvChess {
|
||||||
ChessNum := GoUtil.GetElemNum(ChessList, k)
|
ChessNum := GoUtil.GetElemNum(ChessList, k)
|
||||||
if ChessNum >= 3 && Level >= 12 {
|
if ChessNum >= 2 && Level >= 12 {
|
||||||
b2 := true
|
b2 := true
|
||||||
for _, v := range o.OrderList {
|
for _, v := range o.OrderList {
|
||||||
if GoUtil.SliceEqual(v.MergeId, []int{k, k, k}) {
|
if GoUtil.SliceEqual(v.MergeId, []int{k, k}) {
|
||||||
b2 = false
|
b2 = false
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if b2 {
|
if b2 {
|
||||||
b3 = true
|
b3 = true
|
||||||
o.addOrder([]int{k, k, k}, DIFF_LOW, Extra_type)
|
o.addOrder([]int{k, k}, DIFF_LOW, Extra_type)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -728,13 +728,13 @@ func ReqGetChessFromBuff(player *Player, buf []byte) error {
|
|||||||
"chess_id": ChessId,
|
"chess_id": ChessId,
|
||||||
})
|
})
|
||||||
Update = OrderMod.CreateExtraOrder([]int{ChessId}, AddNewEmit, ChessMod.GetUnlockChessList(), BaseMod.GetEnergyMul(), BaseMod.GetLevel())
|
Update = OrderMod.CreateExtraOrder([]int{ChessId}, AddNewEmit, ChessMod.GetUnlockChessList(), BaseMod.GetEnergyMul(), BaseMod.GetLevel())
|
||||||
if Update {
|
|
||||||
player.PushClientRes(OrderMod.BackData())
|
|
||||||
}
|
|
||||||
triggerComposeChess(player, ChessId, player.PlayMod.getBaseMod().EnergyMul, player.PlayMod.getChessMod().GetEmitList())
|
triggerComposeChess(player, ChessId, player.PlayMod.getBaseMod().EnergyMul, player.PlayMod.getChessMod().GetEmitList())
|
||||||
player.EmitRetireTrigger1()
|
player.EmitRetireTrigger1()
|
||||||
player.InitOrderItem()
|
|
||||||
player.PlayMod.save()
|
player.PlayMod.save()
|
||||||
|
if Update {
|
||||||
|
player.InitOrderItem()
|
||||||
|
player.PushClientRes(OrderMod.BackData())
|
||||||
|
}
|
||||||
player.PushClientRes(ChessMod.BackData())
|
player.PushClientRes(ChessMod.BackData())
|
||||||
player.PushClientRes(&msg.ResGetChessFromBuff{
|
player.PushClientRes(&msg.ResGetChessFromBuff{
|
||||||
Code: msg.RES_CODE_SUCCESS,
|
Code: msg.RES_CODE_SUCCESS,
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user