From 1d0a1f17b4d8179252cc16fd17287a8151124102 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Tue, 16 Sep 2025 18:51:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/mod/order/OrderFunc.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/server/game/mod/order/OrderFunc.go b/src/server/game/mod/order/OrderFunc.go index 5b66f03b..4572f948 100644 --- a/src/server/game/mod/order/OrderFunc.go +++ b/src/server/game/mod/order/OrderFunc.go @@ -552,22 +552,20 @@ func getChessFromPoolByDiff(o *OrderMod, Diff int, Emit []int, EnergyMul int) in * 1. 选取最接近的棋子 */ if MinChessId != 0 { - MinChessColor := mergeDataCfg.GetColorById(MinChessId) - NewEmitChessId := GetEmitByColor(Emit, MinChessColor) - ColorRand := mergeDataCfg.GetEmitProduceType(NewEmitChessId) - ChessMinLv, ChessMaxLv := getChesslvRange(NewEmitChessId, EnergyMul, o.IsCharge) + ColorRand := mergeDataCfg.GetEmitProduceType(EmitChessId) + ChessMinLv, ChessMaxLv := getChesslvRange(EmitChessId, EnergyMul, o.IsCharge) NewLev := getChessLv(ChessMinLv, ChessMaxLv, Diff) MinChessLv := mergeDataCfg.GetLvById(MinChessId) - NewLev2 := mergeDataCfg.DynamicLev2(NewLev, NewEmitChessId, ColorRand[0], MinChessColor) + NewLev2 := mergeDataCfg.DynamicLev2(NewLev, EmitChessId, ColorRand[0], Color) NewLev3 := adjustLev(NewLev2, EnergyMul) o.ChessPool = GoUtil.DeleteEleByValue(o.ChessPool, MinChessId) for i := NewLev3; i < MinChessLv; i++ { - ChessId2 := mergeDataCfg.GetChessIdByLvAndColor(i, MinChessColor) + ChessId2 := mergeDataCfg.GetChessIdByLvAndColor(i, Color) if ChessId2 != 0 { o.ChessPool = append(o.ChessPool, ChessId2) } } - Chess := mergeDataCfg.GetChessIdByLvAndColor(NewLev2, MinChessColor) + Chess := mergeDataCfg.GetChessIdByLvAndColor(NewLev2, Color) return Chess } ChessMinLv, ChessMaxLv := getChesslvRange(EmitChessId, EnergyMul, o.IsCharge)