luying
|
47c64ca2c4
|
Merge branch 'version/v0.1' of gitlab.trgame.cn:zyztech/zyz_server
# Conflicts:
# shared/resource/jsons/dic_api.json
|
2022-01-19 13:46:57 +08:00 |
|
luying
|
64b6d4706e
|
任务：今日挑战区分累积型和去做型
|
2022-01-17 18:20:37 +08:00 |
|
luying
|
683dfeda81
|
后台：添加设置武将星级
|
2022-01-17 16:13:49 +08:00 |
|
luying
|
885fd2d239
|
清理一些console
|
2022-01-12 09:43:26 +08:00 |
|
luying
|
096dad0185
|
后台：添加一下便于操作的内容
|
2021-12-31 16:26:59 +08:00 |
|
luying
|
1ce862b719
|
军团活动：修复粮草先行code不传的问题
|
2021-12-28 18:31:20 +08:00 |
|
luying
|
3824333687
|
礼包码：更新指定礼包码
|
2021-12-27 20:37:19 +08:00 |
|
luying
|
4e3a87359d
|
活动：七天乐添加字段
|
2021-12-26 15:19:39 +08:00 |
|
luying
|
46d74261f1
|
后台：添加玩家日志
|
2021-12-24 16:52:09 +08:00 |
|
luying
|
dc00431010
|
活动：修复七天乐任务
|
2021-12-24 16:01:59 +08:00 |
|
luying
|
7110b6c3a1
|
活动：修复更新
|
2021-12-24 10:56:40 +08:00 |
|
luying
|
1c28661ecf
|
日志：添加玩家日志
|
2021-12-22 21:01:06 +08:00 |
|
luying
|
8c488ea710
|
后台：添加操作日志
|
2021-12-22 17:10:37 +08:00 |
|
luying
|
15b9d9f97a
|
后台：军团管理
|
2021-12-15 19:54:43 +08:00 |
|
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 |
|
luying
|
b6501ee4a2
|
数数：消耗来源
|
2021-12-14 13:18:29 +08:00 |
|
luying
|
fbd19a5c4c
|
后台：礼包码
|
2021-12-10 18:40:57 +08:00 |
|
luying
|
cb999cec10
|
后台：礼包码
|
2021-12-10 17:36:01 +08:00 |
|
luying
|
ecca95b40b
|
后台：跑马灯
|
2021-12-09 20:38:23 +08:00 |
|
luying
|
3db2735d6e
|
后台：邮件设置修复
|
2021-12-09 11:25:26 +08:00 |
|
luying
|
46108f90f2
|
后台：修改白名单
|
2021-12-08 17:35:23 +08:00 |
|
luying
|
fc38485f94
|
后台：自动开服
|
2021-12-08 16:23:00 +08:00 |
|
luying
|
aec83c1481
|
Merge commit '7cfbc45e80094334c9da8fe00c4f5833d67082a7' into feature/backend
|
2021-12-08 10:25:33 +08:00 |
|
luying
|
22f8d3c438
|
后台：服务器维护
|
2021-12-08 10:25:21 +08:00 |
|
luying
|
a754f255ff
|
为了应付web-server的tsc的修改
|
2021-12-07 11:16:37 +08:00 |
|
luying
|
103314a8bf
|
后台：更新开服邮件
|
2021-12-07 10:34:52 +08:00 |
|
luying
|
9e15773055
|
后台：大区列表
|
2021-12-04 18:47:01 +08:00 |
|
luying
|
b505381fa9
|
Merge branch 'master' into feature/backend
# Conflicts:
# game-server/app/servers/connector/filter/global.ts
|
2021-12-03 18:36:39 +08:00 |
|
luying
|
5bd6eb573c
|
战力：修复战力bug
|
2021-12-03 18:34:05 +08:00 |
|
luying
|
0e2baca704
|
活动：修复签到的todayIndex
|
2021-12-01 20:36:33 +08:00 |
|
luying
|
eafc060093
|
后台：邮件审核人
|
2021-12-01 17:42:36 +08:00 |
|
luying
|
53e55b288f
|
后台：邮件
|
2021-12-01 11:30:25 +08:00 |
|
luying
|
c4e4e472d1
|
后台：邮件查询
|
2021-11-29 20:33:36 +08:00 |
|
luying
|
7e46663868
|
后台：武将、装备列表
|
2021-11-29 16:19:47 +08:00 |
|
luying
|
4d6b87ce97
|
后台：道具获取
|
2021-11-29 16:19:47 +08:00 |
|
luying
|
e7566b8af5
|
后台：账号管理
|
2021-11-29 16:19:47 +08:00 |
|
luying
|
5395bbc832
|
邮件：添加标题字段
|
2021-11-29 16:19:36 +08:00 |
|
luying
|
624aa2b5f1
|
sdk：添加获取服务器列表、本地屏蔽词库
|
2021-11-18 16:06:05 +08:00 |
|
luying
|
08fffc2b54
|
任务：排查及修复
|
2021-11-17 18:09:09 +08:00 |
|
luying
|
d7d1afbb2f
|
sdk：修复支付回调bug
|
2021-11-16 16:46:39 +08:00 |
|
luying
|
89e3dd519b
|
屏蔽：处理玩家和军团信息接口
|
2021-11-11 15:51:25 +08:00 |
|
luying
|
bbb2903f12
|
sdk：根据玩家获取军团信息
|
2021-11-11 11:13:45 +08:00 |
|
luying
|
16119ac7a8
|
军团：修复军团id回guildCode
|
2021-11-10 19:52:21 +08:00 |
|
luying
|
a7f3bcc730
|
起名：添加屏蔽词检测
|
2021-11-10 19:41:06 +08:00 |
|
luying
|
32fe508625
|
聊天：添加屏蔽
|
2021-11-10 17:28:11 +08:00 |
|
luying
|
106493b878
|
支付回调
|
2021-11-09 19:24:00 +08:00 |
|
luying
|
fb6a5a785e
|
sdk: 登录
|
2021-11-08 17:47:30 +08:00 |
|
luying
|
88e7ee906d
|
测试：pvp测试
|
2021-11-03 16:58:57 +08:00 |
|
luying
|
158ded6501
|
关卡：星级记录
|
2021-11-03 11:22:55 +08:00 |
|
luying
|
55638b5ed6
|
任务：修复看板提出的任务bug
|
2021-11-02 17:44:34 +08:00 |
|