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

Compare commits

base: tl_server_2:cca29b64c6ac207892e83b0938587e82b9b3f3d0
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:e636afc4aaad8e02d7e5ef9b62df396fca0bde1d
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

4 Commits
cca29b64c6 ... e636afc4aa

Author SHA1 Message Date
sk e636afc4aa Merge branch 'develop' into release 2024-09-19 10:04:46 +08:00
sk 2206eba159 房间列表返回房间最大人数配置 2024-09-19 10:03:57 +08:00
sk 46081a862a Merge branch 'develop' into release 2024-09-19 09:55:14 +08:00
sk e479b2e6fd no message 2024-09-19 09:55:02 +08:00
4 changed files with 960 additions and 948 deletions
Show Stats Expand all files Collapse all files

4
mgrsrv/api/webapi_gamesrv.go
View File

@ -179,10 +179,10 @@ func init() {
logger.Logger.Tracef("GameSrvApi OnChildRespWrapper %v:%v", hChild, ud) logger.Logger.Tracef("GameSrvApi OnChildRespWrapper %v:%v", hChild, ud)
if v, ok := ud.([]byte); ok { if v, ok := ud.([]byte); ok {
var msg webapi.SARoomInfo var msg webapi.SARoomInfo
err := proto.Unmarshal(v, &msg) err := proto.Unmarshal(netlib.SkipHeaderGetRaw(v), &msg)
if err == nil && msg.GetTag() == webapi.TagCode_SUCCESS { if err == nil && msg.GetTag() == webapi.TagCode_SUCCESS {
tNode.TransEnv.SetField(GAMESRVAPI_TRANSACTE_RESPONSE, ud) tNode.TransEnv.SetField(GAMESRVAPI_TRANSACTE_RESPONSE, ud)
} else { } else if err != nil {
logger.Logger.Errorf("GameSrvApi OnChildRespWrapper unmarshal err %v", err) logger.Logger.Errorf("GameSrvApi OnChildRespWrapper unmarshal err %v", err)
} }
} }

1902
protocol/webapi/common.pb.go
View File

File diff suppressed because it is too large Load Diff

1
protocol/webapi/common.proto
View File

@ -248,6 +248,7 @@ message RoomInfo{
string Password = 22;// 密码 string Password = 22;// 密码
int32 CostType = 23;// 付费方式 1房主 2AA int32 CostType = 23;// 付费方式 1房主 2AA
int32 Voice = 24;// 语音开关 1开启 int32 Voice = 24;// 语音开关 1开启
int32 PlayerNum = 25; // 房间最大人数
} }
message PlayerSingleAdjust{ message PlayerSingleAdjust{

1
worldsrv/scenemgr.go
View File

@ -199,6 +199,7 @@ func (m *SceneMgr) MarshalAllRoom(platform string, groupId, gameId int, gameMode
Password: s.GetPassword(), Password: s.GetPassword(),
CostType: s.GetCostType(), CostType: s.GetCostType(),
Voice: s.GetVoice(), Voice: s.GetVoice(),
PlayerNum: int32(s.playerNum),
} }
if s.starting { if s.starting {
si.Start = 1 si.Start = 1