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

Compare commits

base: tl_server_2:f4143ad6d3a4a632015974ebc32e4fffcbcabde0
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:12623d7b94a152e5e7225061dad5956705b3107c
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. "f4143ad6d3a4a632015974ebc32e4fffcbcabde0" and "12623d7b94a152e5e7225061dad5956705b3107c" have entirely different histories.
f4143ad6d3 ... 12623d7b94

1 changed files with 19 additions and 20 deletions
Show Stats Expand all files Collapse all files

5
worldsrv/scenemgr.go
View File

@ -198,7 +198,6 @@ func (m *SceneMgr) MarshalAllRoom(platform string, groupId, gameId int, gameMode
GameMode: int32(s.gameMode), GameMode: int32(s.gameMode),
SceneMode: int32(s.sceneMode), SceneMode: int32(s.sceneMode),
GroupId: s.groupId, GroupId: s.groupId,
GameFreeId: s.dbGameFree.GetId(),
Creator: s.creator, Creator: s.creator,
ReplayCode: s.replayCode, ReplayCode: s.replayCode,
Params: common.CopySliceInt64ToInt32(s.params), Params: common.CopySliceInt64ToInt32(s.params),
@ -206,12 +205,12 @@ func (m *SceneMgr) MarshalAllRoom(platform string, groupId, gameId int, gameMode
RobotCnt: int32(s.robotNum), RobotCnt: int32(s.robotNum),
CreateTime: s.createTime.Unix(), CreateTime: s.createTime.Unix(),
BaseScore: s.dbGameFree.BaseScore, BaseScore: s.dbGameFree.BaseScore,
RoomConfigId: s.GetRoomConfigId(), GameFreeId: s.dbGameFree.GetId(),
CurrRound: s.currRound,
MaxRound: s.totalRound, MaxRound: s.totalRound,
Password: s.GetPassword(), Password: s.GetPassword(),
CostType: s.GetCostType(), CostType: s.GetCostType(),
Voice: s.GetVoice(), Voice: s.GetVoice(),
CurrRound: s.currRound,
} }
if s.starting { if s.starting {
si.Start = 1 si.Start = 1