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

Compare commits

base: tl_server_2:4ff2e84a3cea36715ab66adb93bfc0dbb163a7b3
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:d481ee25b9b79ef129d6b348e351e115684edab2
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. "4ff2e84a3cea36715ab66adb93bfc0dbb163a7b3" and "d481ee25b9b79ef129d6b348e351e115684edab2" have entirely different histories.
4ff2e84a3c ... d481ee25b9

4 changed files with 5 additions and 5 deletions
Show Stats Expand all files Collapse all files

2
.gitignore vendored
View File

@ -47,5 +47,3 @@ tools/xlsx2binary/agc.go
/ranksrv/ranksrv /ranksrv/ranksrv
/schedulesrv/schedulesrv /schedulesrv/schedulesrv
/machine/machine /machine/machine
/statistics/statistics
/statistics/task/task

1
gamesrv/tienlen/scenepolicy_tienlen.go
View File

@ -1814,7 +1814,6 @@ func (this *SceneBilledStateTienLen) OnEnter(s *base.Scene) {
if sceneEx.IsCustom() { if sceneEx.IsCustom() {
v.UnmarkFlag(base.PlayerState_WaitNext) v.UnmarkFlag(base.PlayerState_WaitNext)
v.UnmarkFlag(base.PlayerState_Ready) v.UnmarkFlag(base.PlayerState_Ready)
v.SyncFlag()
} }
} }

3
statistics/build_linux.bat
View File

@ -1,3 +1,6 @@
set GOPATH=D:\godev
go env -w GO111MODULE=on
set CGO_ENABLED=0 set CGO_ENABLED=0
set GOOS=linux set GOOS=linux
set GOARCH=amd64 set GOARCH=amd64

2
statistics/task/build_linux.bat
View File

@ -1,5 +1,5 @@
set CGO_ENABLED=0 set CGO_ENABLED=0
set GOOS=linux set GOOS=linux
set GOARCH=amd64 set GOARCH=amd64
go build go build -o ./task2
pause pause