Commit Graph

423 Commits (bd8b3ac8ff25732a6a24a2739cc47192169ef9f1)

Author SHA1 Message Date
wangyuan 0350e7a4e5 fix 2019-12-11 17:51:53 +08:00
wangyuan 3b0558dc94 reback 2019-12-11 17:47:09 +08:00
wangyuan 8db7c18e68 TeamOneTeamInfo 2019-12-11 17:44:16 +08:00
wangyuan 9d50cb0de2 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-12-11 16:11:46 +08:00
wangyuan 4a47e78ed8 巅峰赛 2019-12-11 16:10:48 +08:00
lvxinran 77360f264f Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-12-09 17:01:11 +08:00
lvxinran 8012fbe5b2 排行榜 公会信息 2019-12-09 17:01:07 +08:00
wangyuan 2e8ab40299 巅峰赛 2019-12-06 20:28:05 +08:00
lvxinran 3b3bda78e6 删除无用协议 2019-11-29 11:28:27 +08:00
lvxinran 56e5a0b952 排行榜协议修改 2019-11-28 16:00:51 +08:00
lvxinran 0ea8ca16c7 排行榜修改重构 2019-11-27 10:48:14 +08:00
lvxinran d4108e898f 修改外观协议 2019-11-20 17:45:28 +08:00
wangyuan 8fee720400 fightresult 2019-11-06 16:09:34 +08:00
lvxinran 7cc6aa7324 好友详细信息是否申请过 2019-10-30 18:24:05 +08:00
lvxinran 25b713a21a 好友协议 2019-10-30 18:14:20 +08:00
wangyuan 8101104ff1 delete unuse hero skill 2019-10-27 11:29:54 +08:00
zhangshanxue 82aa09433f 异常和错误提示修改 2019-10-23 18:29:45 +08:00
wangyuan a86b0009d9 外敌 2019-10-21 18:35:56 +08:00
wangyuan 82ccc44628 set leveltime 2019-10-17 17:17:36 +08:00
wangyuan 92b06e368f 外敌离开时间 2019-10-17 16:32:02 +08:00
zhangshanxue 9b1fc159e5 排行榜优化 2019-10-17 15:23:06 +08:00
wangyuan b021c791b1 guildname 2019-10-16 17:11:20 +08:00
wangyuan e04b76c097 查看基本信息 2019-10-15 16:13:23 +08:00
wangyuan 4b206ce521 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-10-15 14:30:37 +08:00
lvxinran 151b367745 头像修改 2019-10-16 22:02:49 +08:00
wangyuan 84062a4e16 查看详情 2019-10-15 14:30:04 +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
wangyuan 029f870511 hero lock 2019-10-08 15:59:06 +08:00
wangyuan ad514a3370 关卡排行 2019-10-08 11:23:33 +08:00
zhangshanxue 116207f0d3 回复中奖数 2019-09-27 15:24:29 +08:00
zhangshanxue 244ad16a51 幸运探宝 2019-09-25 15:54:49 +08:00
wangyuan bddb28af73 下次刷新时间 2019-09-11 11:05:35 +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
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 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
zhangshanxue 4bb7c9e3d1 魂印协议 2019-09-05 19:23:51 +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 384983c641 魂印协议 2019-09-05 10:18:14 +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 08b2db52ba Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-09-03 15:42:52 +08:00
lvxinran 271708a80c 法宝进阶 2019-09-03 15:42:47 +08:00
wangyuan d1b3377495 delete unuse msg 2019-09-03 14:56:43 +08:00
wangyuan 791d30d8be Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-09-03 14:53:52 +08:00
wangyuan 9b3ff7a88c kill nums 2019-09-03 14:53:37 +08:00
zhangshanxue c5be1b20ce Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-09-03 14:38:52 +08:00
zhangshanxue d5c648b3ab 问卷协议 2019-09-03 14:38:45 +08:00
wangyuan 2eeab08a8e scene msg 2019-09-03 13:44:20 +08:00
lvxinran de0d1e6934 法宝协议 2019-09-02 16:26:12 +08:00
wangyuan 9fc6625449 path mienal 2019-09-02 14:28:46 +08:00
wangyuan b54982523e fight 2019-08-30 18:40:24 +08:00
zhangshanxue c9e4153dfd Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-30 16:48:43 +08:00
lvxinran 23fa28b119 我要变强协议 2019-09-01 16:13:59 +08:00
zhangshanxue 1e38d79616 战力头像 2019-08-30 16:48:39 +08:00
zhangshanxue 74f5090f76 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol
# Conflicts:
#	protos/CommonProto.proto
2019-08-30 11:37:32 +08:00
zhangshanxue ea06554658 手机绑定 2019-08-30 11:36:07 +08:00
wangyuan bb99c92e91 fix name 2019-08-30 10:02:25 +08:00
lvxinran 40ce4b02c0 无尽副本小地图信息 2019-08-31 20:48:45 +08:00
wangyuan c2e67f9668 add template 2019-08-29 16:20:41 +08:00
wangyuan 242eafee62 英雄信息 2019-08-29 15:40:42 +08:00
wangyuan 30c8d01845 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-08-29 15:36:33 +08:00
wangyuan e4a63b7e0e 阻挡点 2019-08-29 15:36:15 +08:00
lvxinran 6538b3668e 无尽副本协议修改 2019-08-29 05:39:59 +08:00
lvxinran 870ac2daf8 无尽副本信息 2019-08-29 02:59:42 +08:00
lvxinran 58cd8a7fda 无尽本协议 2019-08-27 17:41:27 +08:00
lvxinran 7ce5e05576 加入公会限制 2019-08-27 13:20:15 +08:00
lvxinran 153725eebe 进攻血量修改 2019-08-22 11:26:04 +08:00
lvxinran 4cf06fb004 公会协议修改 2019-08-24 23:23:14 +08:00
lvxinran d8c53ff77a Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-24 23:01:38 +08:00
lvxinran 0364d1d95f 公会图腾协议,公会战绩协议 2019-08-24 23:01:32 +08:00
wangyuan 79fdbbb3ff head 2019-08-21 12:18:14 +08:00
wangyuan 546dbab55f 秘境 2019-08-17 10:51:03 +08:00
zhangshanxue 83ee7fa095 妖兽来袭 2019-08-21 14:09:05 +08:00
lvxinran dcc17dbcf4 公会战血量 2019-08-19 11:03:57 +08:00
lvxinran 4df16edaeb 公会协议 2019-08-09 16:36:16 +08:00
lvxinran d8157bd9b3 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-07 17:17:48 +08:00
lvxinran 8978a5be54 公会战协议 2019-08-07 17:17:44 +08:00
zhangshanxue 63f0f27036 排行榜 2019-08-07 16:48:11 +08:00
lvxinran d5f6bcd391 公会战布防协议 2019-08-07 11:27:24 +08:00
lvxinran 1f5fcc0276 协议修改 2019-08-06 10:36:00 +08:00
lvxinran e8f9862e18 第一编队信息协议修改 2019-08-06 10:16:51 +08:00
zhangshanxue 67b85d269d Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-05 21:05:31 +08:00
zhangshanxue bbdcc06c3e 签到 2019-08-05 21:05:23 +08:00
lvxinran b6811294a3 获取异妖编队协议修改 2019-08-05 20:42:26 +08:00
lvxinran edc539754c 获取协议 2019-08-05 20:36:55 +08:00
lvxinran 83ecb337f2 冲突处理 2019-08-05 20:31:40 +08:00
lvxinran 1764c308d7 获取第一编队 2019-08-05 20:28:40 +08:00
zhangshanxue 655bce376b Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-05 18:34:11 +08:00
zhangshanxue 36269c24a8 签到 2019-08-05 18:33:55 +08:00
zhangshanxue 7d53c7aad1 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-07 09:38:58 +08:00
zhangshanxue f6f3d363d7 达人协议 2019-08-07 09:38:53 +08:00
wangyuan 1adee6d68e giftgoods time 2019-08-05 17:04:54 +08:00
wangyuan d5f454fef8 解散公会开始时间 2019-08-03 17:37:46 +08:00
zhangshanxue e0e2793e8b Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol
# Conflicts:
#	protos/CommonProto.proto
#	protos/MessageTypeProto.proto
2019-08-02 13:28:09 +08:00
zhangshanxue 9b5246ce0a 战力排行 2019-08-02 13:26:05 +08:00
lvxinran 399596c8b8 修改 2019-08-02 11:12:27 +08:00
lvxinran cc4baf23fa 标志协议 2019-08-02 11:11:26 +08:00
wangyuan ca23bed2fa family apply 2019-08-01 21:03:02 +08:00
lvxinran d7bf2a8c0e Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-01 18:22:47 +08:00
lvxinran bd95c213dc 协议提交 2019-08-01 18:22:43 +08:00
wangyuan 7863f2c302 fix family 2019-08-01 17:56:31 +08:00
zhangshanxue d657ae3822 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-01 11:58:44 +08:00
zhangshanxue 09ca37893f 招财猫 2019-08-01 11:58:19 +08:00
wangyuan a109e67d2c family base 2019-08-01 11:51:34 +08:00
wangyuan 883713badc Merge branch 'master' of 60.1.1.230:backend/jieling_protocol
# Conflicts:
#	protos/CommonProto.proto
2019-07-31 17:44:54 +08:00
wangyuan c49a9d6c3f family 2019-07-31 17:43:51 +08:00
lvxinran c81581b51c 修改 2019-07-30 15:52:47 +08:00
lvxinran 052fc147dc 无尽副本协议 2019-07-30 15:49:12 +08:00
lvxinran 34c93b9b68 协议提交 2019-07-25 19:09:54 +08:00
lvxinran 87f93324d6 头像框修改 2019-07-25 10:49:40 +08:00
wangyuan 9943482a86 dead times 2019-07-23 19:41:06 +08:00
wangyuan 6250c4e956 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-07-23 11:20:05 +08:00
wangyuan 900ac5532d treasure task 2019-07-23 11:19:53 +08:00
lvxinran fb95a0c21a 云梦祈福协议修改 2019-07-22 18:13:32 +08:00
lvxinran 6d94ca929a 云梦祈福协议提交 2019-07-22 16:06:36 +08:00
lvxinran 1199066ea0 5点重置试炼副本 2019-07-19 17:39:58 +08:00
lvxinran 7ebb8db885 头像框修改添加 2019-07-18 16:02:57 +08:00
wangyuan e9fc318776 购买商品类型结束时间 2019-07-17 15:13:27 +08:00
wangyuan 54707d07f3 fix Proto 2019-07-16 20:57:05 +08:00
wangyuan 8ad62ae897 修改血战协议 2019-07-16 18:29:51 +08:00
lvxinran 0c412019e7 装备附带技能协议提交 2019-07-12 10:14:38 +08:00
lvxinran 94485f64ca 试炼排行榜协议 2019-07-10 11:34:38 +08:00
gaojie 887d5f8d64 fix 2019-07-03 16:26:27 +08:00
gaojie fa160da8b7 fix 2019-07-03 16:12:01 +08:00
gaojie 0e944118f4 fix 2019-07-03 16:11:11 +08:00
gaojie 637924d5e3 刷新道具数量 2019-07-03 15:44:22 +08:00
jiahuiwen 84dd7e5a9a 试炼精气 2019-06-26 17:26:27 +08:00
jiahuiwen 9841869b38 试炼副本 修改 2019-06-26 11:20:36 +08:00
wangyuan 549b667d7d fix mision 2019-06-21 17:02:11 +08:00
wangyuan 1814e351fb 精英怪 2019-06-20 11:12:44 +08:00
wangyuan ba11565a6a 科技树 2019-06-19 14:49:31 +08:00
wangyuan be57426afe 每日刷新次数走vip 2019-06-15 14:50:06 +08:00
wangyuan 52d7b77125 match 2019-06-14 18:41:37 +08:00
wangyuan c7bc1ce163 装备入手时间 2019-06-13 19:26:45 +08:00
wangyuan 0b56484e50 获取天赋异妖信息 2019-06-12 20:13:55 +08:00
wangyuan d10fc68937 fix 2019-06-16 03:19:40 +08:00
gaojie a567484c5c 赠送体力,删除好友 2019-06-11 10:45:23 +08:00
gaojie ce75d59625 lua协议提交 2019-06-10 17:02:29 +08:00
gaojie b32cef852a Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol
# Conflicts:
#	protos/CommonProto.proto
#	protos/MessageTypeProto.proto
#	protos/PlayerInfoProto.proto
2019-06-06 17:23:25 +08:00
gaojie 4ea63dbdbf 好友 2019-06-06 17:22:03 +08:00
wangyuan ed8a860468 活动开启状态 2019-06-06 14:22:52 +08:00
wangyuan fe9e6d3826 提交首冲 2019-06-06 12:14:28 +08:00
wangyuan 58076f61d1 购买礼包 2019-06-06 10:15:01 +08:00
wangyuan f3d340f839 每日任务 2019-06-05 10:47:38 +08:00
wangyuan c61e623dcc 累计充值活动 2019-06-04 09:52:53 +08:00
wangyuan d2b9af5cc7 fix comment 2019-06-02 17:09:57 +08:00
wangyuan 6569401a46 fix 2019-05-27 20:21:42 +08:00
wangyuan b59f3e25e7 战力变更 2019-05-27 20:18:55 +08:00
wangyuan 09f75235fb Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-05-27 14:02:01 +08:00
wangyuan f0034260c9 vip任务相关协议 2019-05-27 14:01:40 +08:00
wangyuan bd840fc87f fix name 2019-05-24 16:26:43 +08:00
wangyuan 3fc5344b23 vip特权 2019-05-24 07:34:22 +08:00
wangyuan 11abb3d96a 区域等级 2019-05-21 17:37:25 +08:00
wangyuan ff151b470d 挂机推送 2019-05-16 20:18:34 +08:00
wangyuan 46bb38fde3 delete 2019-05-16 19:22:49 +08:00
wangyuan bcbab8834d fix 2019-05-16 16:45:11 +08:00
wangyuan 5397f27327 挂机刷新发现boss 2019-05-16 16:33:33 +08:00
wangyuan e6532f394e Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-05-16 14:37:13 +08:00
wangyuan 9872ff269f 挂机协议 2019-05-16 14:36:57 +08:00
gaojie 7563a5c03a Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol
# Conflicts:
#	protos/PlayerInfoProto.proto
2019-05-14 17:15:01 +08:00
gaojie 7254e72af6 fix 2019-05-14 17:14:13 +08:00
wangyuan d82265d293 time function 2019-05-14 16:31:30 +08:00
wangyuan be9d558f17 时间控制功能 2019-05-14 10:23:05 +08:00
gaojie d88f58b835 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol
# Conflicts:
#	protos/CommonProto.proto
2019-05-11 17:22:51 +08:00
gaojie 5265a6302b 获取商店信息 2019-05-11 17:22:16 +08:00
wangyuan 5b9874121c arena record 2019-05-11 16:24:06 +08:00
wangyuan f4f4ba33f4 秘盒 2019-05-10 13:33:25 +08:00
wangyuan 427b1e8f92 排行榜信息 2019-05-10 10:31:06 +08:00
wangyuan 04f4958ab3 删除排名 2019-05-10 10:11:57 +08:00
wangyuan c62740355b fight time 2019-05-09 17:44:53 +08:00
wangyuan ffc5f435ee fix 2019-05-09 16:34:31 +08:00
wangyuan 7cf2919302 获取竞技场基本信息 2019-05-09 15:37:36 +08:00
wangyuan 02f7b662b4 重铸等级 2019-05-09 11:03:49 +08:00
wangyuan 4f8acaf535 gm response 2019-04-30 15:56:18 +08:00
wangyuan 56b8cdf80e gm response 2019-04-30 10:27:36 +08:00
wangyuan ca61dbca3d 活动返回list 2019-04-22 18:00:38 +08:00
wangyuan 2ef1f58f1a 章节奖励移到活动中 2019-04-22 14:53:08 +08:00
wangyuan 7d08c6f7fb Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-04-19 11:30:11 +08:00
wangyuan 445b09b7c7 delete unuse 2019-04-19 11:29:00 +08:00
jiahuiwen 7fe15d037a Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-04-19 11:28:27 +08:00
jiahuiwen 26e55d63b5 地图信息 2019-04-19 11:28:15 +08:00
wangyuan 1a1a709d3b outtime 2019-04-19 10:59:58 +08:00
jiahuiwen f39ccb0ce6 副本扫荡,购买挑战次数,获取排行榜 2019-04-17 19:01:54 +08:00
wangyuan a43111e382 探索度 删除无效协议 2019-04-16 19:56:39 +08:00
wangyuan e3289f2f1a 挂机 删除不必要的字段 2019-04-16 13:47:02 +08:00
jiahuiwen 917ea1f2fa 完成任务所用时间 2019-04-15 10:20:15 +08:00
jiahuiwen e2718b20c6 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol
# Conflicts:
#	protos/MapInfoProto.proto
2019-04-12 14:54:23 +08:00
jiahuiwen a251ab906b 地图探索 2019-04-12 13:49:17 +08:00
gaojie 2fd2313ab9 fix 2019-04-11 20:37:22 +08:00
gaojie 6059e4ce3d 关卡 2019-04-11 17:25:57 +08:00
wangyuan aab529209e 保存新手节点 2019-04-09 14:12:30 +08:00