Commit Graph
8 Commits
Author SHA1 Message Date
luying 780562979e 后台添加权限管理 2020-09-22 11:10:45 +08:00
luying bcbed5959f 添加后台连接用的后端 2020-09-22 11:09:15 +08:00
luying 51b0912db7 fix 冗余引入 2020-09-14 18:26:26 +08:00
luying b976859469 Merge branch 'master' into feature/normalBattle 2020-09-14 18:24:30 +08:00
luying be2093b82a fix 合并时回退了的package 2020-09-14 18:02:36 +08:00
luying 693a87cd89 修改关卡记录逻辑 2020-09-14 15:38:04 +08:00
luying b6725151d0 Merge branch 'master' of gitlab.trgame.cn:zyztech/zyz_server into feature/normalBattle
Conflicts:
	game-server/startGameServer.sh
	web-server/package.json
2020-09-14 10:55:46 +08:00
luying 0880f26aa1 reset 2020-09-14 10:53:47 +08:00