From 50a4a9d9c2cdce19660d6cbb2b376513c75c5893 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Tue, 10 Mar 2026 10:26:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BB=B7=E6=A0=BC=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/conf/order/order_cfg.go | 4 ++-- src/server/game/message_handler.go | 2 +- src/server/test/order_test.go | 12 ++++++++++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/server/conf/order/order_cfg.go b/src/server/conf/order/order_cfg.go index 80101af2..27c64a43 100644 --- a/src/server/conf/order/order_cfg.go +++ b/src/server/conf/order/order_cfg.go @@ -1,6 +1,7 @@ package orderCfg import ( + "math" "server/gamedata" "sort" "strconv" @@ -33,8 +34,7 @@ func GetOrderK(Lv int) int { } Energy := gamedata.GetIntValue(data, "Energy") K := gamedata.GetFloatValue(data, "K") - a := float64(Energy)*K/10 + 0.5 - return int(a) * 10 + return int(math.Round(float64(Energy)*K/10) * 10) } func GetOrderFactor(Scene int) int { diff --git a/src/server/game/message_handler.go b/src/server/game/message_handler.go index 21401bda..1d6e9c54 100644 --- a/src/server/game/message_handler.go +++ b/src/server/game/message_handler.go @@ -1135,7 +1135,7 @@ func (player *Player) InitOrderItem() { continue } Star := order.GetOrderStar(v.MergeId, ChessMod.GetStarEmitList()) - Star = int(float64(Star)*float64(OrderFactor+1000)/10000) * 10 + Star = int(float64(Star)*float64(OrderFactor)/1000) * 10 v.Items = []*item.Item{{Id: item.ITEM_STAR_ID, Num: Star}} OrderMod.OrderList[k] = v } diff --git a/src/server/test/order_test.go b/src/server/test/order_test.go index 3624ef70..a6941e28 100644 --- a/src/server/test/order_test.go +++ b/src/server/test/order_test.go @@ -40,3 +40,15 @@ func TestChestRain(t *testing.T) { f := LimitEventMod.GetMeteorReward([]int{226}, ChessMod.GetStarEmitList()) fmt.Printf("chest rain reward:%v", f) } + +func TestInitOrderItem(t *testing.T) { + p1 := new(game.Player) + p1.InitPlayer("3625212") + OrderMod := p1.GetOrderMod() + OrderMod.OrderList = make(map[int]order.Order) + OrderMod.OrderList[1] = order.Order{ + MergeId: []int{15, 15}, + } + p1.InitOrderItem() + fmt.Printf("order item:%v", OrderMod.OrderList[1].Items) +}