tl_server_2
/
game_sync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: tl_server_2:db1a88684a94f3fa4767a23d8544104336ac8626
Branches Tags
tl_server_2:main
tl_server_2:dev_login
tl_server_2:develop
tl_server_2:dev_slots
tl_server_2:release
tl_server_2:dev_third
tl_server_2:dev_expireitem
tl_server_2:ma
tl_server_2:machine
..
compare: tl_server_2:82cf0a550aed40b5a1e72bd89d80ebcfd15f7b51
Branches Tags
tl_server_2:dev_login
tl_server_2:develop
tl_server_2:dev_slots
tl_server_2:release
tl_server_2:dev_third
tl_server_2:dev_expireitem
tl_server_2:ma
tl_server_2:machine
tl_server_2:main

No commits in common. "db1a88684a94f3fa4767a23d8544104336ac8626" and "82cf0a550aed40b5a1e72bd89d80ebcfd15f7b51" have entirely different histories.
db1a88684a ... 82cf0a550a

1 changed files with 0 additions and 12 deletions
Show Stats Expand all files Collapse all files

12
worldsrv/scene.go
View File

@ -952,16 +952,6 @@ func (this *Scene) ProtoPrivateRoom() *gamehall.PrivateRoomInfo {
if this.GetPassword() != "" { if this.GetPassword() != "" {
needPassword = int32(1) needPassword = int32(1)
} }
cost := this.sp.NeedRoomCardCost(int(this.CustomParam.GetCostType()), this.playerNum, PlatformMgrSingleton.GetConfig(this.platform.IdStr).RoomConfig[this.CustomParam.GetRoomConfigId()])
var costItems []*gamehall.ItemInfo
for _, vv := range cost {
costItems = append(costItems, &gamehall.ItemInfo{
Id: vv.ItemID,
Num: int32(vv.Count),
})
}
ret := &gamehall.PrivateRoomInfo{ ret := &gamehall.PrivateRoomInfo{
GameFreeId: this.dbGameFree.GetId(), GameFreeId: this.dbGameFree.GetId(),
GameId: int32(this.gameId), GameId: int32(this.gameId),
@ -976,7 +966,6 @@ func (this *Scene) ProtoPrivateRoom() *gamehall.PrivateRoomInfo {
CreateTs: this.createTime.Unix(), CreateTs: this.createTime.Unix(),
State: this.SceneState, State: this.SceneState,
CostType: this.CustomParam.GetCostType(), CostType: this.CustomParam.GetCostType(),
Cost: costItems,
} }
for _, v := range this.players { for _, v := range this.players {
ret.Players = append(ret.Players, &gamehall.PrivatePlayerInfo{ ret.Players = append(ret.Players, &gamehall.PrivatePlayerInfo{
@ -991,7 +980,6 @@ func (this *Scene) ProtoPrivateRoom() *gamehall.PrivateRoomInfo {
ret.WinSnId = p.SnId ret.WinSnId = p.SnId
ret.WinName = p.GetName() ret.WinName = p.GetName()
ret.WinRoleId = p.Roles.ModId ret.WinRoleId = p.Roles.ModId
ret.WinHeadUrl = p.HeadUrl
} }
} }
return ret return ret