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

..

dictionary

后台：更新开服邮件

2021-12-07 10:34:52 +08:00

authenticateUtil.ts

防沉迷：不使用厚土sdk

2021-08-20 18:33:11 +08:00

data.ts

后台：更新开服邮件

2021-12-07 10:34:52 +08:00

dicParam.ts

更新

2021-12-09 16:42:47 +08:00

dispatcher.ts

登录优化：gate可变为短链接

2021-09-03 10:36:11 +08:00

friendUtil.ts

军团活动：修复rpc调用以及其他问题

2021-03-19 18:28:50 +08:00

httpUtil.ts

sdk：添加获取服务器列表、本地屏蔽词库

2021-11-18 16:06:05 +08:00

interface.ts

pvp: 更改pvpdefense结构

2021-10-29 16:36:23 +08:00

itemUtils.ts

数数：消耗来源

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

playerCe.ts

皮肤：武将、时装表修改

2021-10-19 14:26:17 +08:00

redis.ts

支付回调

2021-11-09 19:24:00 +08:00

roleUtil.ts

Merge branch 'master' into feature/backend

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

sdkUtil.ts

sdk：添加获取服务器列表、本地屏蔽词库

2021-11-18 16:06:05 +08:00

taskUtil.ts

任务：group读取方式修改

2021-11-20 10:48:50 +08:00

timeUtil.ts

演武台：转入拍卖行时间

2021-09-22 20:25:04 +08:00

trie.ts

sdk：添加获取服务器列表、本地屏蔽词库

2021-11-18 16:06:05 +08:00

util.ts

Merge branch 'master' into feature/backend

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