From f6243d164cf0830c7a2e6a2da8d153e6972bd4b3 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Tue, 21 Jan 2025 16:47:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=80=8D=E6=95=B0highRoller?=
 =?UTF-8?q?=E5=88=B0=E6=9C=9F=E4=B8=8B=E8=B0=83=E5=80=8D=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/conf/base/BaseCfg.go       | 18 +-----------------
 src/server/game/LimitedTimeTrigger.go |  2 +-
 src/server/game/PlayerBaseMod.go      |  2 +-
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/src/server/conf/base/BaseCfg.go b/src/server/conf/base/BaseCfg.go
index 9a64b72f..8dae5c95 100644
--- a/src/server/conf/base/BaseCfg.go
+++ b/src/server/conf/base/BaseCfg.go
@@ -39,23 +39,7 @@ func GetEnergyByMul(T int) float64 {
 	}
 }
 
-func GetMaxEnergyMul(Lv int) int {
-	Mul := 0
-	for i := 0; i < 999; i++ {
-		data, err := gamedata.GetDataByIntKey(ENERGY_CFG, i)
-		if err != nil {
-			break
-		}
-		UnlockLv := gamedata.GetIntValue(data, "UnlockLv")
-		if Lv < UnlockLv {
-			break
-		}
-		Mul = i - 1
-	}
-	return Mul
-}
-
-func GetMaxEnergyMul2(Lv int, Energy int) int {
+func GetMaxEnergyMul(Lv int, Energy int) int {
 	Mul := 0
 	for i := 0; i < 999; i++ {
 		data, err := gamedata.GetDataByIntKey(ENERGY_CFG, i)
diff --git a/src/server/game/LimitedTimeTrigger.go b/src/server/game/LimitedTimeTrigger.go
index 0899fe8e..d1a48b33 100644
--- a/src/server/game/LimitedTimeTrigger.go
+++ b/src/server/game/LimitedTimeTrigger.go
@@ -41,7 +41,7 @@ func LimitedTimeEventTrigger(p *Player, AddEventId int) {
 		case limitedTimeEvent.EVENT_TYPE_HIGH_ROLLER:
 			BaseMod := p.PlayMod.getBaseMod()
 			EnergyMul := BaseMod.GetEnergyMul()
-			MaxEnergyMul := baseCfg.GetMaxEnergyMul2(BaseMod.GetLevel(), BaseMod.GetEnergy())
+			MaxEnergyMul := baseCfg.GetMaxEnergyMul(BaseMod.GetLevel(), BaseMod.GetEnergy())
 			p.PlayMod.getBaseMod().ResetEnergyMul(MaxEnergyMul)
 			NewEnergyMul := p.PlayMod.getBaseMod().GetEnergyMul()
 			OrderMod := p.PlayMod.getOrderMod()
diff --git a/src/server/game/PlayerBaseMod.go b/src/server/game/PlayerBaseMod.go
index c3d8bb01..8ec37048 100644
--- a/src/server/game/PlayerBaseMod.go
+++ b/src/server/game/PlayerBaseMod.go
@@ -149,7 +149,7 @@ func (p *PlayerBaseData) SaveDataFromDB(Key interface{}) bool {
 
 func (p *PlayerBaseData) GetMaxEnergyMul(player *Player) int {
 	BaseMod := player.PlayMod.getBaseMod()
-	MaxEnergyMul := baseCfg.GetMaxEnergyMul(BaseMod.Level)
+	MaxEnergyMul := baseCfg.GetMaxEnergyMul(BaseMod.GetLevel(), BaseMod.GetEnergy())
 	if player.PlayMod.getLimitedTimeEventMod().CheckExist(limitedTimeEvent.EVENT_TYPE_HIGH_ROLLER) {
 		MaxEnergyMul = 11
 	}