From acf3a5851564fd6d20da9d891415929a070edd2d Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Tue, 24 Jun 2025 17:20:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/RegisterNetworkFunc.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/server/game/RegisterNetworkFunc.go b/src/server/game/RegisterNetworkFunc.go
index f07a1e45..c72b5419 100644
--- a/src/server/game/RegisterNetworkFunc.go
+++ b/src/server/game/RegisterNetworkFunc.go
@@ -105,7 +105,6 @@ func ReqUnBindFacebook(player *Player, buf []byte) error {
 }
 
 func ReqOnlyBindFacebook(player *Player, buf []byte) error {
-
 	player.PlayerBaseMod.ReqOnlyBindFacebook(player, buf)
 	return nil
 }
@@ -119,7 +118,9 @@ func RegSetEneryFunc(player *Player, buf []byte) error {
 	req := &msg.ReqSetEnergyMul{}
 	proto.Unmarshal(buf, req)
 	MaxEnergyMul := player.GetPlayerBaseMod().GetMaxEnergyMul(player)
-	if int(req.EnergyMul) > MaxEnergyMul {
+	BaseMod := player.PlayMod.getBaseMod()
+	EnergyMul := BaseMod.GetEnergyMul()
+	if int(req.EnergyMul) > EnergyMul && int(req.EnergyMul) > MaxEnergyMul {
 		player.SendErrClienRes(&msg.ResSetEnergyMul{
 			ResultCode: msg.RES_CODE_FAIL,
 			Msg:        "能量倍数超过最大值",
@@ -127,7 +128,7 @@ func RegSetEneryFunc(player *Player, buf []byte) error {
 		return errors.New("能量倍数超过最大值")
 	}
 	player.TeLog("mutil_merge_change", map[string]interface{}{
-		"change_from": math.Pow(2, float64(MaxEnergyMul)),
+		"change_from": math.Pow(2, float64(BaseMod.GetEnergyMul())),
 		"change_to":   math.Pow(2, float64(req.EnergyMul)),
 		"is_auto":     false,
 	})