pet_home/pet_home_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改订单逻辑

Browse Source
This commit is contained in:
hahwu 2025-01-15 14:29:09 +08:00
parent 83bfb64d49
commit e8fd0d9953
1 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/server/game/mod/order/OrderFunc.go
View File

@ -247,22 +247,6 @@ func randOrderChess(o *OrderMod, lv int, Emit []int, EnergyMul int) ([]int, int,
mergeList := make([]int, 0, len(ChessDiff))
// 根据订单棋子难度生成棋子
for _, v := range ChessDiff {
// EmitId := getEmitId(o, Emit)
// ColorRand := mergeDataCfg.GetEmitOrderProduce(EmitId)
// Color := GoUtil.RandStringSlice(ColorRand)
// EmitChessId := getEmitByColor(Emit, Color)
// ChessMinLv, ChessMaxLv := getChesslvRange(EmitChessId, EnergyMul)
// NewLev := getChessLv(ChessMinLv, ChessMaxLv, v)
// ColorMaxLv := mergeDataCfg.GetMaxLvByColor(Color)
// NewLev = min(NewLev, ColorMaxLv)
// ChessId := mergeDataCfg.GetChessIdByLvAndColor(NewLev, Color)
// Type := mergeDataCfg.GetTypeById(ChessId)
// if Type != "Product" {
// continue
// }
// if ChessId == 0 {
// continue
// }
ChessId := 0
for {
ChessId = getChessFromPoolByDiff(o, v, Emit, EnergyMul)
@ -340,19 +324,9 @@ func getChessFromPoolByDiff(o *OrderMod, Diff int, Emit []int, EnergyMul int) in
if !GoUtil.InStringArray(chessColor, ColorRand) {
continue
}
if reflectChess[chess] == Diff {
// ChessLev := mergeDataCfg.GetLvById(chess)
ChessLv := mergeDataCfg.GetLvById(chess)
if reflectChess[chess] == Diff && ChessLv >= EnergyMul+1 && ChessLv <= EnergyMul+12 {
o.ChessPool = append(o.ChessPool[:i], o.ChessPool[i+1:]...)
// for _, i := range ColorRand {
// if i == Color {
// continue
// }
// NewLev2 := mergeDataCfg.DynamicLev2(ChessLev, EmitChessId, Color, i)
// ChessId2 := mergeDataCfg.GetChessIdByLvAndColor(NewLev2, i)
// if ChessId2 != 0 {
// o.ChessPool = append(o.ChessPool, ChessId2)
// }
// }
return chess
}
}
@ -361,6 +335,7 @@ func getChessFromPoolByDiff(o *OrderMod, Diff int, Emit []int, EnergyMul int) in
ChessMinLv, ChessMaxLv := getChesslvRange(EmitChessId, EnergyMul)
NewLev := getChessLv(ChessMinLv, ChessMaxLv, Diff)
NewLev1 := mergeDataCfg.DynamicLev(NewLev, EmitChessId, Color)
NewLev1 = adjustLev(NewLev1, EnergyMul)
if MinChessId != 0 {
MinChessColor := mergeDataCfg.GetColorById(MinChessId)
MinChessLv := mergeDataCfg.GetLvById(MinChessId)
@ -382,6 +357,7 @@ func getChessFromPoolByDiff(o *OrderMod, Diff int, Emit []int, EnergyMul int) in
continue
}
NewLev2 := mergeDataCfg.DynamicLev2(NewLev1, EmitChessId, Color, i)
NewLev2 = adjustLev(NewLev2, EnergyMul)
ChessId2 := mergeDataCfg.GetChessIdByLvAndColor(NewLev2, i)
if ChessId2 != 0 {
o.ChessPool = append(o.ChessPool, ChessId2)
@ -427,3 +403,7 @@ func initReflectChess2(Color string, Start, End, Diff, adjust int) {
reflectChess[ChessId] = Diff
}
}
func adjustLev(Lev, EnergyMul int) int {
return max(min(Lev, EnergyMul+12), EnergyMul+1)
}