luying 5cfd22bbf4 Merge branch 'feature/hero' of gitlab.trgame.cn:zyztech/zyz_server ...

Conflicts:
	shared/consts/consts.ts
	shared/db/Role.ts
	web-server/app/service/Auth.ts

2020-12-14 11:17:02 +08:00

..

actor.ts

fix 注掉actor没有使用的变量

2020-12-14 09:56:12 +08:00

gamedata.ts

Merge branch 'feature/hero' of gitlab.trgame.cn:zyztech/zyz_server

2020-12-14 11:17:02 +08:00

util.ts

fix some format

2020-12-10 14:12:31 +08:00