diff --git a/src/server/cluster/Type.go b/src/server/cluster/Type.go index 3a012e66..02b39ebd 100644 --- a/src/server/cluster/Type.go +++ b/src/server/cluster/Type.go @@ -12,6 +12,7 @@ func init() { type ClusterJoinData struct { ServerId int + Country int RemoteAddr string } diff --git a/src/server/game/PlayerChessMod.go b/src/server/game/PlayerChessMod.go index 88f3765e..454390bb 100644 --- a/src/server/game/PlayerChessMod.go +++ b/src/server/game/PlayerChessMod.go @@ -234,10 +234,14 @@ func (p *PlayerChessData) HandleChess(player *Player, handle_list []*msg.ChessHa if err != nil { return nil, nil, err } + get_star_num := 0 + if len(items) > 0 && items[0].Id == item.ITEM_STAR_ID { + get_star_num = items[0].Num + } player.TeLog("sell_item", map[string]interface{}{ "merge_item_id": ChessId, "product_name": mergeDataCfg.GetNameById(ChessId), - "get_star_num": items[0].Num, + "get_star_num": get_star_num, }) itemList = item.Merge(itemList, items) case msg.HANDLE_TYPE_REMOVE: //移除棋子 diff --git a/src/server/game/RegisterNetworkFunc.go b/src/server/game/RegisterNetworkFunc.go index 18db8157..1769a3cf 100644 --- a/src/server/game/RegisterNetworkFunc.go +++ b/src/server/game/RegisterNetworkFunc.go @@ -96,6 +96,7 @@ func ReqFriendPlayerSimple(player *Player, buf []byte) error { Time: LastActLog.Time, Param: LastActLog.Param, } + player.PushClientRes(PlayerSimpleData) return nil }