diff --git a/src/server/game/mod/order/order_func.go b/src/server/game/mod/order/order_func.go index c159f64c..f20b4a46 100644 --- a/src/server/game/mod/order/order_func.go +++ b/src/server/game/mod/order/order_func.go @@ -4,7 +4,6 @@ import ( "math" mergeDataCfg "server/conf/merge_data" orderCfg "server/conf/order" - userCfg "server/conf/user" GoUtil "server/game_util" "sort" ) @@ -421,16 +420,7 @@ func GetVirtualEnergy(mergeList, emitList []int) int { func randSuperOrderChess(o *OrderMod, lv int, emit []int, energyMul, orderDiff int) ([]int, int, error) { initReflectChess(emit, energyMul) filterPool(o) - orderN, err := userCfg.GetOrderNByLv(lv) - randChessNum := map[int]int{ - 2: 70 - orderN, - 3: 30 + orderN, - } - if err != nil { - return nil, DIFF_LOW, err - } - chessNum := GoUtil.RandMap(randChessNum) - minEnergy, maxEnergy, _ := getChessByDiff(lv, orderDiff, Super_type) + minEnergy, maxEnergy, chessNum := getChessByDiff(lv, orderDiff, Super_type) mergeList := getChessFromPoolByEnergy(o, minEnergy, maxEnergy, chessNum, emit, energyMul, orderDiff, Super_type) return mergeList, orderDiff, nil } diff --git a/src/server/test/order_test.go b/src/server/test/order_test.go index d938b93d..c7cbddbb 100644 --- a/src/server/test/order_test.go +++ b/src/server/test/order_test.go @@ -93,3 +93,14 @@ func TestCreatePetOrder(t *testing.T) { OrderMod.CreatePetOrder(BaseMod.GetLevel(), ChessMod.GetOrderEmit(), BaseMod.GetEnergyMul(), order.Pet_type) } } + +func TestCreateSuperOrder(t *testing.T) { + p1 := new(game.Player) + p1.InitPlayer("3625212") + OrderMod := p1.GetOrderMod() + BaseMod := p1.GetBaseMod() + ChessMod := p1.GetChessMod() + for i := 0; i < 10; i++ { + OrderMod.CreateSuperOrder(BaseMod.GetLevel(), ChessMod.GetOrderEmit(), BaseMod.GetEnergyMul()) + } +}