订单优化
This commit is contained in:
parent
2d68b7e2af
commit
78bfb4eb2d
@ -1,6 +1,7 @@
|
|||||||
package order
|
package order
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"log"
|
||||||
"math"
|
"math"
|
||||||
"server/GoUtil"
|
"server/GoUtil"
|
||||||
mergeDataCfg "server/conf/mergeData"
|
mergeDataCfg "server/conf/mergeData"
|
||||||
@ -648,8 +649,12 @@ func getEmitSeries(o *OrderMod, Emit []int) string {
|
|||||||
o.initColorShuffle(Emit)
|
o.initColorShuffle(Emit)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
if o.LastColor == PopEmitId {
|
||||||
|
continue
|
||||||
|
}
|
||||||
PopEmitIdProductNum := mergeDataCfg.GetEmitProductNumByColor(PopEmitId)
|
PopEmitIdProductNum := mergeDataCfg.GetEmitProductNumByColor(PopEmitId)
|
||||||
o.initColorShuffle(Emit)
|
o.initColorShuffle(Emit)
|
||||||
|
// 单链棋子 且订单中已有两个 跳过
|
||||||
if PopEmitIdProductNum == 1 && ChessColorNum[PopEmitId] >= 2 {
|
if PopEmitIdProductNum == 1 && ChessColorNum[PopEmitId] >= 2 {
|
||||||
continue
|
continue
|
||||||
} else {
|
} else {
|
||||||
@ -845,6 +850,9 @@ func getChessFromPoolByEnergy(o *OrderMod, MinEnergy, MaxEnergy, ChessNum int, E
|
|||||||
for i := 0; i < ChessNum; i++ {
|
for i := 0; i < ChessNum; i++ {
|
||||||
ColorArr = append(ColorArr, getEmitSeries(o, Emit))
|
ColorArr = append(ColorArr, getEmitSeries(o, Emit))
|
||||||
}
|
}
|
||||||
|
if len(ColorArr) == 2 && ColorArr[0] == ColorArr[1] {
|
||||||
|
log.Default()
|
||||||
|
}
|
||||||
ChessArr := make([]int, 0)
|
ChessArr := make([]int, 0)
|
||||||
if len(ColorArr) == 1 {
|
if len(ColorArr) == 1 {
|
||||||
Chess, _ := o.getChessIdPool(Emit, ColorArr[0], EnergyMul, 0, MinEnergy, MaxEnergy, OrderDiff, 0)
|
Chess, _ := o.getChessIdPool(Emit, ColorArr[0], EnergyMul, 0, MinEnergy, MaxEnergy, OrderDiff, 0)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user