高级订单修复
This commit is contained in:
parent
c485317d8f
commit
67b7f09a6a
@ -281,7 +281,7 @@ func getChesslvRange(Emit int, EnergyMul int) (int, int) {
|
||||
|
||||
func triggerComposeChess(player *Player, ChessId, EnergyMul int, Emit []int) {
|
||||
OrderMod := player.PlayMod.getOrderMod()
|
||||
if OrderMod.Step != 12 {
|
||||
if OrderMod.Step < 12 {
|
||||
return
|
||||
}
|
||||
if !checkChess(ChessId, EnergyMul, Emit) {
|
||||
|
||||
@ -364,7 +364,7 @@ func ReqDelOrder(player *Player, buf []byte) error {
|
||||
req := &msg.ReqDelOrder{}
|
||||
proto.Unmarshal(buf, req)
|
||||
OrderMod := player.PlayMod.getOrderMod()
|
||||
err := OrderMod.DelOrder(int(req.OrderId))
|
||||
DelOrder, err := OrderMod.DelOrder(int(req.OrderId))
|
||||
if err != nil {
|
||||
player.SendErrClienRes(&msg.ResDelOrder{
|
||||
Code: msg.RES_CODE_FAIL,
|
||||
@ -375,6 +375,10 @@ func ReqDelOrder(player *Player, buf []byte) error {
|
||||
player.PushAndSendClienRes(&msg.ResDelOrder{
|
||||
Code: msg.RES_CODE_SUCCESS,
|
||||
})
|
||||
player.TeLog("order_delete", map[string]interface{}{
|
||||
"order_id": int(req.OrderId),
|
||||
"order": DelOrder,
|
||||
})
|
||||
player.PushClientRes(OrderMod.BackData())
|
||||
return nil
|
||||
}
|
||||
|
||||
@ -658,16 +658,16 @@ func (o *OrderMod) Retire(EmitId string) {
|
||||
o.EmitShuffle = nil
|
||||
}
|
||||
|
||||
func (o *OrderMod) DelOrder(OrderId int) error {
|
||||
func (o *OrderMod) DelOrder(OrderId int) (*Order, error) {
|
||||
Order, ok := o.OrderList[OrderId]
|
||||
if !ok {
|
||||
return fmt.Errorf("order not exist")
|
||||
return nil, fmt.Errorf("order not exist")
|
||||
}
|
||||
if Order.Type != Clean_Order_type {
|
||||
return fmt.Errorf("order type wrong")
|
||||
return nil, fmt.Errorf("order type wrong")
|
||||
}
|
||||
delete(o.OrderList, OrderId)
|
||||
return nil
|
||||
return &Order, nil
|
||||
}
|
||||
|
||||
func (o *OrderMod) CreateComfortOrder(lv int, Emit []int, EnergyMul, Diff, ChessNum int) error {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user