Commit Graph

474 Commits

Author SHA1 Message Date
luying
c06ef998ff Merge branch 'feature/test' 2022-03-04 16:33:55 +08:00
luying
c4a5534b19 后台:修复字段 2022-03-04 10:19:54 +08:00
luying
8649cb82b7 活动:每日充值 2022-03-04 09:47:24 +08:00
luying
f099daf80b 活动:限时排行榜 2022-03-04 09:47:24 +08:00
luying
d0eb46ece4 活动:转盘修改记录 2022-03-04 09:47:24 +08:00
luying
7ab714ec25 活动:转盘 2022-03-04 09:47:24 +08:00
luying
c8c64f7e48 活动:首充增加页签 2022-03-04 09:47:24 +08:00
luying
153633b9f1 军团活动:修改粮草先行道具分配 2022-03-01 10:10:11 +08:00
luying
c4703ba26c 装备:武将详情接口 2022-02-28 17:44:45 +08:00
luying
bf73985623 武将重生:完成接口 2022-02-28 15:15:00 +08:00
luying
3f5371df79 装备:任务 2022-02-22 10:56:41 +08:00
luying
bd76fa9e94 pvp:修改等级和军功对应关系 2022-02-21 15:10:56 +08:00
luying
2773d1d9db 好友:武将详情 2022-02-18 11:30:42 +08:00
luying
c87f50ced0 寻宝:协助次数&匹配范围修改 2022-02-17 20:01:57 +08:00
luying
ecc55b3063 修改数据库,姑且跑起来 2022-02-15 18:46:56 +08:00
luying
579c2ad28c 后台:订单列表 2022-02-11 15:31:48 +08:00
luying
04ebd0a9d7 后台:虚拟充值 2022-02-10 20:20:31 +08:00
luying
b67e4448df 军团:减少getGuildMember的返回数据 2022-01-25 17:49:24 +08:00
luying
685e9779e2 活动:修改显示逻辑 2022-01-24 17:20:22 +08:00
luying
e791077a45 活动:新手活动使用通用时间 2022-01-20 20:35:28 +08:00
luying
cd18ac4327 活动:修复每日特惠礼包 2022-01-20 12:08:10 +08:00
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