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

..

abilityConst.ts

属性：加值和加百分比的type值修改

2021-10-11 16:06:09 +08:00

activityConst.ts

sdk：37sdk发起支付接口

2021-11-09 11:53:00 +08:00

auctionConst.ts

拍卖行：价格修改

2021-09-24 11:38:41 +08:00

battleConst.ts

数数：消耗来源

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

chatConst.ts

聊天：添加屏蔽

2021-11-10 17:28:11 +08:00

guildConst.ts

演武台：结构修改

2021-10-20 15:55:50 +08:00

heroConst.ts

装备：精炼

2021-07-29 18:50:26 +08:00

httpConst.ts

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

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

itemConst.ts

pvp：头像框解锁

2021-11-02 19:36:03 +08:00

mailConst.ts

后台：邮件审核人

2021-12-01 17:42:36 +08:00

selectConst.ts

参数：添加军团名参数

2021-11-17 13:53:52 +08:00

sysConst.ts

Merge branch 'master' into feature/backend

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