luying
|
6b809d1b2b
|
Merge branch 'feature/login'
Conflicts:
game-server/app/servers/role/handler/heroHandler.ts
game-server/app/services/redisService.ts
shared/consts/index.ts
shared/resource/jsons/dic_zyz_gk_main.json
|
2021-03-08 11:04:09 +08:00 |
|
liangtongchuan
|
b276b40c7d
|
聊天：系统聊天限制
|
2021-03-07 16:47:49 +08:00 |
|
luying
|
62562c3482
|
登录: fix checkTelNo返回错误
|
2021-03-04 15:45:19 +08:00 |
|
luying
|
525bfd36bc
|
登录：实名认证
|
2021-03-04 15:34:26 +08:00 |
|
luying
|
bbdc20240d
|
登录：绑定、服务器列表
|
2021-03-04 15:34:02 +08:00 |
|
luying
|
9dfee7f49c
|
登录：装备，密码，短信登录
|
2021-03-04 15:34:01 +08:00 |
|
mamengke01
|
0e933d1ec4
|
炼器堂，练兵场，事件开启，redlock注释
|
2021-02-24 15:15:22 +08:00 |
|
mamengke01
|
33fb6689f7
|
邮件，pvp赛季结算，boss关卡注释
|
2021-02-23 20:30:16 +08:00 |
|
mamengke01
|
63cd693935
|
邮件
|
2021-02-07 16:26:31 +08:00 |
|
luying
|
871e71ab54
|
好友：寻宝关系加成及黑名单屏蔽
|
2021-02-05 11:29:38 +08:00 |
|
luying
|
fe85f0e247
|
好友：赠送领取爱心
|
2021-02-03 19:12:43 +08:00 |
|
luying
|
2d2c9907ab
|
好友：拉黑
|
2021-02-03 11:49:46 +08:00 |
|
mamengke01
|
f836d6586a
|
捐献所
|
2021-02-03 10:39:43 +08:00 |
|
luying
|
1fb4e7b9be
|
好友：一键申请提示
|
2021-02-02 19:48:06 +08:00 |
|
mamengke01
|
830836b809
|
许愿池
|
2021-02-01 20:01:56 +08:00 |
|
mamengke01
|
afddeba1c9
|
捐献
|
2021-01-29 16:35:42 +08:00 |
|
mamengke01
|
54dde229d3
|
练兵接口调整，新增获得宝箱和战报
|
2021-01-28 20:07:08 +08:00 |
|
liangtongchuan
|
11c5705a5f
|
寻宝：增加设置情谊助战的接口
|
2021-01-27 16:00:49 +08:00 |
|
mamengke01
|
771ac8c1fe
|
Merge branch 'master' of gitlab.trgame.cn:zyztech/zyz_server
|
2021-01-26 18:41:28 +08:00 |
|
mamengke01
|
b09b67ac99
|
领取训练场进阶奖励
|
2021-01-26 18:41:24 +08:00 |
|
luying
|
02b21f27e0
|
军团：添加锁
|
2021-01-26 16:55:04 +08:00 |
|
mamengke01
|
fb56dd00ec
|
炼器堂
|
2021-01-26 16:50:39 +08:00 |
|
mamengke01
|
3c3e734019
|
练兵场结算
|
2021-01-26 10:41:54 +08:00 |
|
mamengke01
|
bb2f17089e
|
试炼
|
2021-01-23 17:05:53 +08:00 |
|
mamengke01
|
3e6ec77d56
|
军团表逻辑
|
2021-01-23 17:04:25 +08:00 |
|
luying
|
789322b913
|
军团：添加活跃宝箱
|
2021-01-23 15:17:33 +08:00 |
|
mamengke01
|
5da371a17d
|
演武场和练兵场
|
2021-01-22 09:44:13 +08:00 |
|
luying
|
48ee9267ab
|
升级建筑物
|
2021-01-21 16:25:32 +08:00 |
|
luying
|
3a0f31ea0b
|
军团：弹劾
|
2021-01-21 11:37:37 +08:00 |
|
luying
|
89937ef672
|
军团：修改信息
|
2021-01-20 20:51:06 +08:00 |
|
luying
|
89c7b117b2
|
军团：邀请被邀请
|
2021-01-20 19:30:11 +08:00 |
|
luying
|
9b6ca78d88
|
军团：添加踢人解散退出，添加权限
|
2021-01-20 15:47:57 +08:00 |
|
luying
|
ac081059c2
|
获取列表，申请，同意
|
2021-01-19 21:06:04 +08:00 |
|
luying
|
3c35852495
|
创建公会
|
2021-01-18 21:05:25 +08:00 |
|
luying
|
e17ed4cd47
|
添加刷新消耗
|
2021-01-08 16:41:24 +08:00 |
|
mamengke01
|
12f308f0f5
|
获得战报，刷新，领取
|
2021-01-08 16:17:19 +08:00 |
|
luying
|
5bfac1723c
|
添加获取对手阵容，开始战斗，结算
|
2021-01-07 17:38:07 +08:00 |
|
mamengke01
|
d70cabfdbb
|
装备穿戴战力bug
|
2020-12-29 19:48:20 +08:00 |
|
mamengke01
|
a27cf802e8
|
远程登录
|
2020-12-25 17:57:27 +08:00 |
|
luying
|
21ab617e90
|
添加百家学宫和名将谱，未计算战力
|
2020-12-25 15:05:17 +08:00 |
|
mamengke01
|
04fa4e79cf
|
装备
|
2020-12-25 14:15:36 +08:00 |
|
mamengke01
|
526ed39feb
|
神像
|
2020-12-24 16:38:07 +08:00 |
|
liangtongchuan
|
5cbeaa83e9
|
创建新区时检查之前列表
|
2020-12-23 18:05:51 +08:00 |
|
luying
|
5a6f574541
|
洗炼重复锁定判断
|
2020-12-23 10:21:03 +08:00 |
|
mamengke01
|
eec53b688f
|
战力，出生皮肤
|
2020-12-22 14:07:43 +08:00 |
|
mamengke01
|
86ff7e5dfd
|
物品返回格式
|
2020-12-21 16:05:40 +08:00 |
|
mamengke01
|
e05577bae8
|
Merge branch 'master' of gitlab.trgame.cn:zyztech/zyz_server
|
2020-12-18 21:32:51 +08:00 |
|
mamengke01
|
8bbee53433
|
装备
|
2020-12-18 21:32:39 +08:00 |
|
luying
|
45a405114c
|
fix 锁定消耗
|
2020-12-18 20:13:45 +08:00 |
|
mamengke01
|
e5af16be8e
|
Merge branch 'master' of gitlab.trgame.cn:zyztech/zyz_server
|
2020-12-18 19:46:48 +08:00 |
|