diff --git a/src/server/game/PlayerChessMod.go b/src/server/game/PlayerChessMod.go index 4cd26807..342c160d 100644 --- a/src/server/game/PlayerChessMod.go +++ b/src/server/game/PlayerChessMod.go @@ -197,9 +197,9 @@ func (p *PlayerChessData) HandleChess(player *Player, handle_list []*msg.ChessHa itemList = append(itemList, &item.Item{Id: item.ITEM_STAR_ID, Num: int(-loseGold)}) case msg.HANDLE_TYPE_SELL: //出售棋子 items, err := ChessMod.SellChess(ChessId) - // if checkChess(ChessId, BaseMod.GetEnergyMul(), ChessMod.GetEmitList()) { // 在订单中无法生成的棋子 出售获得原价宠物币 - // items = []*item.Item{{Id: item.ITEM_STAR_ID, Num: mergeDataCfg.GetStarById(ChessId)}} - // } + if checkChess(ChessId, BaseMod.GetEnergyMul(), ChessMod.GetEmitList()) { // 在订单中无法生成的棋子 出售获得原价宠物币 + items = []*item.Item{{Id: item.ITEM_STAR_ID, Num: mergeDataCfg.GetStarById(ChessId)}} + } if err != nil { return err } @@ -254,12 +254,9 @@ func checkChess(ChessId, EnergyMul int, Emit []int) bool { break } } - Min, Max := getChesslvRange(EmitId, EnergyMul) + _, Max := getChesslvRange(EmitId, EnergyMul) Adjust := mergeDataCfg.GetAdjust(EmitId, ChessIdColor) - if ChessIdLv < Min-Adjust || ChessIdLv > Max-Adjust { - return true - } - return false + return ChessIdLv > Max-Adjust } func getChesslvRange(Emit int, EnergyMul int) (int, int) { @@ -275,7 +272,6 @@ func getChesslvRange(Emit int, EnergyMul int) (int, int) { } func triggerComposeChess(player *Player, ChessId, EnergyMul int, Emit []int) { - return //TODO 暂时不用 if !checkChess(ChessId, EnergyMul, Emit) { return }