测试脚本优化
This commit is contained in:
parent
42d59026fd
commit
83568e3c23
@ -230,7 +230,9 @@ func ReqServerInfo(args []interface{}) error {
|
|||||||
}
|
}
|
||||||
if vmStat != nil {
|
if vmStat != nil {
|
||||||
res["FreeMem"] = vmStat.Available / (1024 * 1024)
|
res["FreeMem"] = vmStat.Available / (1024 * 1024)
|
||||||
|
res["UsageMem"] = vmStat.Used / (1024 * 1024)
|
||||||
} else {
|
} else {
|
||||||
|
res["UsageMem"] = 0
|
||||||
res["FreeMem"] = 0
|
res["FreeMem"] = 0
|
||||||
}
|
}
|
||||||
res["Version"] = conf.Server.Version
|
res["Version"] = conf.Server.Version
|
||||||
|
|||||||
14
src/server/game/mod_factory.go
Normal file
14
src/server/game/mod_factory.go
Normal file
@ -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()
|
||||||
|
}
|
||||||
@ -6,7 +6,6 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
"math"
|
"math"
|
||||||
"server/conf"
|
|
||||||
activityCfg "server/conf/activity"
|
activityCfg "server/conf/activity"
|
||||||
cardCfg "server/conf/card"
|
cardCfg "server/conf/card"
|
||||||
chargeCfg "server/conf/charge"
|
chargeCfg "server/conf/charge"
|
||||||
@ -869,11 +868,6 @@ func (p *Player) HandleItem(itemList []*item.Item, Label string) error {
|
|||||||
|
|
||||||
// 登录返回数据
|
// 登录返回数据
|
||||||
func (p *Player) LoginBackData() {
|
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.Base.BackData())
|
||||||
p.PushClientRes(p.PlayMod.mod_list.Handbook.BackData())
|
p.PushClientRes(p.PlayMod.mod_list.Handbook.BackData())
|
||||||
p.PushClientRes(p.PlayMod.mod_list.Base.BackData())
|
p.PushClientRes(p.PlayMod.mod_list.Base.BackData())
|
||||||
|
|||||||
22
src/server/test/order_test.go
Normal file
22
src/server/test/order_test.go
Normal file
@ -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)
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue
Block a user