luying d4722c4099 Merge branch 'master' into feature/backend ...

# Conflicts:
#	game-server/app/servers/connector/handler/entryHandler.ts
#	game-server/app/servers/role/handler/itemHandler.ts
#	shared/consts/constModules/sysConst.ts
#	shared/pubUtils/util.ts
#	web-server/app.ts
#	web-server/app/service/Auth.ts

2021-12-14 18:08:44 +08:00

..

activityField

活动：修复签到的todayIndex

2021-12-01 20:36:33 +08:00

backEndField

后台：礼包码

2021-12-10 18:40:57 +08:00

battleField

测试：pvp测试

2021-11-03 16:58:57 +08:00

gameField

后台：服务器维护

2021-12-08 10:25:21 +08:00

roleField

Merge branch 'master' into feature/backend

2021-12-03 18:36:39 +08:00

ChannelUser.ts

寻宝：抽象队长匹配队友的逻辑；抽象 channel 中的用户

2021-02-19 17:58:00 +08:00

dbGeneral.ts

数数：消耗来源

2021-12-14 13:18:29 +08:00

rank.ts

pvp：修复赛季相关

2021-11-02 10:16:50 +08:00

sdk.ts

为了应付web-server的tsc的修改

2021-12-07 11:16:37 +08:00