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
parent 0880f26aa1 47c902b931
commit b6725151d0
40 changed files with 145 additions and 875 deletions
--- a/web-server/config/plugin.ts
+++ b/web-server/config/plugin.ts
@@ -1,4 +1,5 @@
 import { EggPlugin } from 'egg';
+import 'tsconfig-paths/register';

 const plugin: EggPlugin = {
  static: true,