Commit Graph

685 Commits (9929a07d50f17dfa13b00716d2116dd09ecb0d2a)

Author SHA1 Message Date
zhangshanxue 223797c487 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-10-15 15:15:22 +08:00
zhangshanxue 08ad0c9f87 跑马灯 2019-10-15 15:15:15 +08:00
lvxinran 891767ea89 头像协议修改 2019-10-17 00:02:32 +08:00
lvxinran 223e5e3b64 修改头像协议 2019-10-16 22:05:22 +08:00
lvxinran 4e7b6ad9a4 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-10-16 22:02:54 +08:00
lvxinran 151b367745 头像修改 2019-10-16 22:02:49 +08:00
lvxinran ca2179170b 删除邮件 2019-12-14 08:38:07 +08:00
wangyuan 4b206ce521 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-10-15 14:30:37 +08:00
wangyuan 84062a4e16 查看详情 2019-10-15 14:30:04 +08:00
wangyuan f66be87583 一键移除 2019-10-11 18:29:30 +08:00
lvxinran 8a2cc3842a 戒灵秘宝等级推送 2019-10-10 11:27:37 +08:00
lvxinran f5238e426c 戒灵秘宝 2019-10-09 20:23:53 +08:00
lvxinran d66afb32d0 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-10-09 20:00:30 +08:00
lvxinran 5f940182dc 戒灵秘宝推送 2019-10-09 20:00:26 +08:00
lvxinran 22a542dd49 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-10-20 16:47:26 +08:00
lvxinran 0d2fdac2c2 秘宝直购等级 2019-10-20 16:47:21 +08:00
lvxinran bc428daa75 孙龙宝藏购买等级 2019-10-19 15:49:01 +08:00
lvxinran 4c8400e997 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-10-19 15:36:47 +08:00
lvxinran 3034b031af 孙龙等级 2019-10-19 15:36:39 +08:00
wangyuan 6d628a6c6c fix black 2019-10-09 15:48:49 +08:00
wangyuan ee1b87c8d5 登录给黑名单信息 2019-10-09 15:25:54 +08:00
wangyuan f6fa44e3a9 好友黑名单操作 2019-10-09 15:11:48 +08:00
wangyuan 029f870511 hero lock 2019-10-08 15:59:06 +08:00
zhangshanxue bc0eaa1bbf Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol
# Conflicts:
#	protos/FightInfoProto.proto
2019-10-08 14:57:28 +08:00
zhangshanxue e1a8e416a1 兽潮快速战斗 2019-10-08 14:56:48 +08:00
wangyuan 12b35f1014 英雄回溯 2019-10-08 14:17:25 +08:00
wangyuan ad514a3370 关卡排行 2019-10-08 11:23:33 +08:00
zhangshanxue 1653479c68 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-09-28 16:32:37 +08:00
zhangshanxue 2aed3dc8e8 幸运探宝 2019-09-28 16:32:33 +08:00
zhangshanxue 8a113561cf Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-09-27 15:24:33 +08:00
zhangshanxue 116207f0d3 回复中奖数 2019-09-27 15:24:29 +08:00
lvxinran 0bb2752032 Merge branch 'project0.93' 2019-09-27 04:50:13 +08:00
lvxinran 2a9a1b5831 修改公会协议 2019-09-27 04:49:48 +08:00
lvxinran 092f55ccf7 踢人indication 2019-09-26 11:21:19 +08:00
lvxinran 864a5822a9 公会相关协议 2019-09-26 11:14:47 +08:00
zhangshanxue 4175b75d04 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-09-26 11:02:51 +08:00
zhangshanxue b0f999ca6e 幸运探宝 2019-09-26 11:02:46 +08:00
wangyuan abdde1bc35 切磋 2019-09-25 18:12:21 +08:00
wangyuan 452b5e51b8 work shop level 2019-09-25 17:27:35 +08:00
zhangshanxue bb086b8110 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol
# Conflicts:
#	protos/PlayerInfoProto.proto
2019-09-25 15:55:33 +08:00
zhangshanxue 244ad16a51 幸运探宝 2019-09-25 15:54:49 +08:00
wangyuan 937fb0002e hero level 2019-09-25 13:43:13 +08:00
wangyuan e4b240ea5c 挂机 2019-09-24 17:21:35 +08:00
wangyuan 54b4e8a577 fix 2019-09-24 15:08:44 +08:00
lvxinran 95a8518037 无尽indication 2019-10-12 11:17:07 +08:00
lvxinran da6c1d0370 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-10-12 11:14:47 +08:00
lvxinran 651078ad2a 无尽地图更换协议 2019-10-12 11:14:32 +08:00
wangyuan c3e6c72af4 新关卡 2019-09-24 14:00:15 +08:00
wangyuan 58490572dd guild chat type 2019-09-24 10:20:01 +08:00
lvxinran c59b9c9d1b 公会战公会id 2019-09-24 12:35:36 +08:00
lvxinran ce656e5bbd 公会战协议 2019-09-27 12:45:47 +08:00
zhangshanxue 15a4a22f49 观星优化 2019-09-23 16:24:47 +08:00
zhangshanxue c6259f8927 占星优化 2019-09-23 13:58:39 +08:00
wangyuan 36728ebb38 道具直购 2019-09-17 10:17:05 +08:00
zhangshanxue dece921a6a Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-09-16 20:59:06 +08:00
zhangshanxue bd59ebd035 魂印卡池 2019-09-16 20:59:02 +08:00
wangyuan f99f3efa1e fix name 2019-09-16 17:11:32 +08:00
wangyuan f98fd74cfc 购买商品id 2019-09-16 17:09:11 +08:00
wangyuan e1ea7c0e19 通知前端充值成功 2019-09-16 17:06:21 +08:00
wangyuan eebdb8de23 tean info 2019-09-16 13:35:34 +08:00
zhangshanxue eba468f633 cdk 2019-09-12 18:10:57 +08:00
wangyuan 2a8bda3cc7 fix chat 2019-09-11 18:15:38 +08:00
wangyuan bddb28af73 下次刷新时间 2019-09-11 11:05:35 +08:00
zhangshanxue 27586e1166 一键装备 2019-09-11 10:23:20 +08:00
lvxinran 583728a0b7 公会协议 2019-09-13 12:21:39 +08:00
lvxinran d3e076e850 星数添加 2019-09-12 17:14:59 +08:00
lvxinran bfcab57c5a 无尽协议 2019-09-12 17:03:26 +08:00
lvxinran 44954ea9f4 无尽推送 2019-09-12 16:50:42 +08:00
zhangshanxue 0c5d3ddb24 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-09-09 18:26:01 +08:00
zhangshanxue 3331f847c5 问卷优化 2019-09-09 18:25:49 +08:00
wangyuan 84744378cb 倒计时 2019-09-09 17:28:33 +08:00
wangyuan 8c1f032800 血战积分 2019-09-07 17:16:36 +08:00
zhangshanxue 92af610f3c Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-09-07 12:56:06 +08:00
zhangshanxue adc409a1c7 魂印掉落 2019-09-07 12:55:58 +08:00
wangyuan ec68586cfa bloody state change 2019-09-06 17:07:53 +08:00
wangyuan e91b616a2a 血战领取积分奖励 2019-09-06 15:30:30 +08:00
wangyuan 858276118c fix 2019-09-06 14:16:06 +08:00
wangyuan 15e32fc5b7 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-09-06 10:39:29 +08:00
wangyuan 6718d2be66 跨服 2019-09-06 10:38:59 +08:00
lvxinran 755b1e9eac 无尽跳过战斗修改 2019-09-05 20:26:02 +08:00
zhangshanxue 5e0772f6a5 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-09-05 19:23:59 +08:00
zhangshanxue 4bb7c9e3d1 魂印协议 2019-09-05 19:23:51 +08:00
lvxinran bea0b890db 无尽设置战斗模式 2019-09-05 18:27:53 +08:00
lvxinran 411b3ad94c 排行榜修改 2019-09-05 17:21:49 +08:00
lvxinran 9a1f3db2d1 血战排行榜个人信息 2019-09-05 17:18:54 +08:00
zhangshanxue 486cef6996 魂印协议 2019-09-05 15:51:07 +08:00
lvxinran bbfc5ac5a0 血战排行修改 2019-09-05 12:00:29 +08:00
lvxinran eb8392ec42 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-09-05 11:38:08 +08:00
lvxinran b86da952b4 血战排行榜 2019-09-05 11:38:03 +08:00
zhangshanxue b34ff9908d Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol
# Conflicts:
#	protos/MessageTypeProto.proto
2019-09-05 10:19:16 +08:00
zhangshanxue 384983c641 魂印协议 2019-09-05 10:18:14 +08:00
lvxinran 130d91a17b Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-09-04 14:31:24 +08:00
lvxinran 6be6e25b67 无尽副本空地刷新小怪 2019-09-04 14:31:21 +08:00
zhangshanxue 480efcd287 问卷 2019-09-04 14:06:08 +08:00
zhangshanxue f0da57b9e6 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-09-04 11:55:06 +08:00
zhangshanxue e530927b93 问卷调查 2019-09-04 11:55:02 +08:00
lvxinran 36b74fcad7 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-09-03 20:47:42 +08:00
lvxinran 1998fad43c 修改我要变强 2019-09-03 20:47:38 +08:00
wangyuan bb7dfa4c91 head 2019-09-03 20:23:00 +08:00
wangyuan a2c6c67c65 基本信息 2019-09-03 19:34:46 +08:00