From 430514447265554ca888d1db4681cd563ecc7fc8 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Mon, 20 Oct 2025 10:26:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=8B=E5=AD=90=E5=95=86=E5=BA=97bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/conf/charge/ChargeCfg.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/server/conf/charge/ChargeCfg.go b/src/server/conf/charge/ChargeCfg.go index 1e234aee..836dee26 100644 --- a/src/server/conf/charge/ChargeCfg.go +++ b/src/server/conf/charge/ChargeCfg.go @@ -1,7 +1,6 @@ package chargeCfg import ( - "encoding/json" "server/GoUtil" "server/game/mod/item" "server/gamedata" @@ -90,16 +89,18 @@ func GetEnergyShopId(ChargeId int) int { return 0 } -func GetWeeklyInfo(Id int) (int, int) { +func GetWeeklyInfo(Pos int) (int, int) { data, err := gamedata.GetDataByKey(CFG_CHARGE_CONST, "weekly_chess_shop") if err != nil { return 0, 0 } - var r map[string]interface{} - json.Unmarshal([]byte(gamedata.GetStringValue(data, "Value")), &r) - if val, ok := r[GoUtil.String(Id)]; ok { - arr := val.(map[string]interface{}) - return GoUtil.Int(arr["Discount"]), GoUtil.Int(arr["Limit"]) + r := data["Value"].([]interface{}) + for _, v := range r { + v1 := v.(map[string]interface{}) + Id := GoUtil.Int(v1["Id"]) + if Id == Pos { + return GoUtil.Int(v1["Discount"]), GoUtil.Int(v1["Limit"]) + } } return 0, 0 }