From 83568e3c231e0f0c1b1ff6397781ff489975854b Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Tue, 30 Dec 2025 15:51:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=84=9A=E6=9C=AC=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/admin.go | 2 ++ src/server/game/mod_factory.go | 14 ++++++++++++++ src/server/game/player_data.go | 6 ------ src/server/test/order_test.go | 22 ++++++++++++++++++++++ 4 files changed, 38 insertions(+), 6 deletions(-) create mode 100644 src/server/game/mod_factory.go create mode 100644 src/server/test/order_test.go diff --git a/src/server/game/admin.go b/src/server/game/admin.go index c0e026f3..923193f2 100644 --- a/src/server/game/admin.go +++ b/src/server/game/admin.go @@ -230,7 +230,9 @@ func ReqServerInfo(args []interface{}) error { } if vmStat != nil { res["FreeMem"] = vmStat.Available / (1024 * 1024) + res["UsageMem"] = vmStat.Used / (1024 * 1024) } else { + res["UsageMem"] = 0 res["FreeMem"] = 0 } res["Version"] = conf.Server.Version diff --git a/src/server/game/mod_factory.go b/src/server/game/mod_factory.go new file mode 100644 index 00000000..4d9187e6 --- /dev/null +++ b/src/server/game/mod_factory.go @@ -0,0 +1,14 @@ +package game + +import ( + "server/game/mod/chess" + "server/game/mod/decorate" +) + +func (p *Player) GetChessMod() *chess.ChessBorad { + return p.PlayMod.getChessMod() +} + +func (p *Player) GetDecorateMod() *decorate.Decorate { + return p.PlayMod.getDecorateMod() +} diff --git a/src/server/game/player_data.go b/src/server/game/player_data.go index 6cd9be96..8a150400 100644 --- a/src/server/game/player_data.go +++ b/src/server/game/player_data.go @@ -6,7 +6,6 @@ import ( "encoding/json" "errors" "math" - "server/conf" activityCfg "server/conf/activity" cardCfg "server/conf/card" chargeCfg "server/conf/charge" @@ -869,11 +868,6 @@ func (p *Player) HandleItem(itemList []*item.Item, Label string) error { // 登录返回数据 func (p *Player) LoginBackData() { - SendMsgToCenterAsync(&MsgMod.Msg{ - From: int(p.M_DwUin), - HandleType: MsgMod.HANDLE_MOD_PLAYER_LOGIN, - Extra: conf.Server.ServerID, - }) p.PushClientRes(p.PlayMod.mod_list.Base.BackData()) p.PushClientRes(p.PlayMod.mod_list.Handbook.BackData()) p.PushClientRes(p.PlayMod.mod_list.Base.BackData()) diff --git a/src/server/test/order_test.go b/src/server/test/order_test.go new file mode 100644 index 00000000..456bc06d --- /dev/null +++ b/src/server/test/order_test.go @@ -0,0 +1,22 @@ +package test + +import ( + "fmt" + orderCfg "server/conf/order" + "server/game" + "server/game/mod/order" + "testing" +) + +func TestOrderStart(t *testing.T) { + p1 := new(game.Player) + p1.InitPlayer("test") + game.G_GameLogicPtr.SetPlayer(p1) + ChessMod := p1.GetChessMod() + DecorateMod := p1.GetDecorateMod() + merge_id := []int{64, 249} + order_facotry := orderCfg.GetOrderFactor(DecorateMod.GetAreaId()) + star := order.GetOrderStar(merge_id, ChessMod.GetStarEmitList()) + star = int(float64(star)*float64(order_facotry)/1000+0.5) * 10 + fmt.Printf("star is %d", star) +}