Commit Graph

524 Commits (794b58cde53fea15daa152defcd65f82bf39dd26)

Author SHA1 Message Date
zhangshanxue 1ff6327aa2 性别信息 2021-02-20 17:21:59 +08:00
duhui 8bc2e1421c 神树 2020-12-18 16:14:11 +08:00
duhui 3329b730d6 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_protocol into master_test_hw 2020-12-17 10:01:06 +08:00
duhui 7632c96830 战报功能和公告 2020-12-17 10:00:50 +08:00
lvxinran b97e312785 四灵试炼协议 2020-12-16 11:26:23 +08:00
lvxinran f30caed97d Merge branch 'master_test_hw' into master_test_hw_arean
# Conflicts:
#	protos/MessageTypeProto.proto
2020-12-12 14:11:59 +08:00
lvxinran e63792bf7b 排行榜区服 2020-12-12 13:51:31 +08:00
lvxinran 1919fce306 Merge branch 'master_test_hw_arean' of http://60.1.1.230/backend/jieling_protocol into master_test_hw_arean
# Conflicts:
#	protos/MessageTypeProto.proto
2020-12-12 11:14:23 +08:00
lvxinran a8506cb603 跨服十绝阵协议 2020-12-12 11:13:21 +08:00
zhangshanxue df927056d0 跨服服务器 2020-12-10 19:02:48 +08:00
duhui 8ee13742ed 神树升级协议,chat加了个注释,不影响 2020-12-10 14:47:50 +08:00
zhangshanxue 13e2cb8f21 跨服服务器 2020-12-02 10:26:24 +08:00
zhangshanxue a18412872a 跨服服务器通信初版完成 2020-11-19 20:35:16 +08:00
lvxinran a9bcef1d37 Merge branch 'master_test_hw' into master_test_skin 2020-11-06 10:19:45 +08:00
lvxinran fbf5bad0ee 战斗内皮肤协议 2020-11-13 05:52:17 +08:00
lvxinran 64c34e4bd1 皮肤展示 2020-12-07 15:06:52 +08:00
zhangshanxue a2e0a37bf3 猎妖之路队伍站位 2020-11-05 15:21:27 +08:00
lvxinran 025662706d 皮肤协议提交 2020-10-28 19:54:45 +08:00
lvxinran aeabaa9b34 首通奖励 2020-10-27 17:52:16 +08:00
lvxinran 1ff2f9e6ab Merge branch 'master_test_hw' into master_test_hw_special_monster 2020-10-27 13:58:25 +08:00
lvxinran 3aba0f133e 查看信息协议修改 2020-10-26 11:00:42 +08:00
lvxinran 0f8e9aca39 战斗协议修改 2020-10-24 19:06:42 +08:00
lvxinran 4da39090bb 灵兽技能修改 2020-10-23 17:53:45 +08:00
lvxinran b8b24da2b8 协议修改 2020-10-22 10:15:25 +08:00
jiahuiwen 7953508f8a 替换异妖编队 2020-10-20 17:26:28 +08:00
lvxinran 0e1241b8b8 逍遥游红点 2020-10-19 20:13:46 +08:00
lvxinran f90745123d 灵兽协议 2020-10-19 16:01:07 +08:00
lvxinran 3d9bbe425f 格子协议修改 2020-10-16 10:07:43 +08:00
lvxinran 0d56d8a7cf 逍遥游 购买,战斗,协议提交 2020-10-15 12:15:47 +08:00
lvxinran 1e4ff76b46 逍遥游战斗协议 2020-10-15 10:31:21 +08:00
lvxinran f189b68730 逍遥游boss 转盘协议 2020-10-14 21:13:15 +08:00
lvxinran 8131b8c6ba 格子索引添加 2020-10-13 18:36:32 +08:00
lvxinran f020848946 逍遥游协议 2020-10-31 10:58:30 +08:00
zhangshanxue dd53a67961 充值类型更换 2020-08-14 23:40:40 +08:00
lvxinran 76ed52a5d0 Merge branch 'master' into equip_develop
# Conflicts:
#	protos/HeroInfoProto.proto
2020-08-16 14:23:08 +08:00
lvxinran 7fb732d262 通关id修改 2020-08-13 10:00:44 +08:00
zhangshanxue 10af265bfb 英雄置换 2020-08-10 10:48:51 +08:00
lvxinran 09e57f804a 轩辕宝镜协议 2020-08-07 16:45:01 +08:00
lvxinran 4c499ce319 排行榜类型修改 2020-07-31 16:19:53 +08:00
zhangshanxue f4c96fad9d 先手 2020-07-25 21:35:01 +08:00
lvxinran f60867732c Hero协议修改 2020-07-05 08:07:56 +08:00
zhangshanxue 2452696009 TASK 【ID1006484】竞技场进度奖励 2020-07-06 21:12:49 +08:00
lvxinran dd4bd0f970 英雄图鉴协议修改 2020-06-24 17:24:25 +08:00
lvxinran 3c0310b7c7 排行性别添加 2020-06-05 15:28:23 +08:00
zhangshanxue bc9b7a921d 战斗单元新增英雄星级 2020-06-01 15:48:22 +08:00
zhangshanxue 302b617582 Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化) 2020-05-21 10:40:55 +08:00
wangyuan 72403bbe30 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2020-05-19 13:37:27 +08:00
wangyuan f701ac3a7e 战斗添加额外参数(猎妖之路被动) 2020-05-19 13:37:15 +08:00
zhangshanxue af76611c2f Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化) 2020-05-19 12:02:04 +08:00
zhangshanxue ed1ba6bb23 Task【新战斗版本】公会援助 协议提交 2020-05-13 15:28:48 +08:00
zhangshanxue 028bbc281c Task【新战斗版本】公会援助 协议提交 2020-05-13 11:20:37 +08:00
zhangshanxue 6d9e76bf0f Task【新战斗版本】公会援助 协议提交 2020-05-12 10:20:03 +08:00
wangyuan 22116b4247 add uid 2020-05-08 15:30:31 +08:00
wangyuan 5e70446bd2 car record 2020-05-08 15:16:03 +08:00
zhangshanxue 5bb1ca6b9e 祭祀 2020-05-07 17:14:16 +08:00
wangyuan f9147f5006 hero position 2020-05-01 10:15:39 +08:00
lvxinran 3eb8dbf292 英雄身上宝器协议 2020-04-26 11:33:08 +08:00
lvxinran cb44c2f3cf 日常副本 协议 2020-04-24 14:12:23 +08:00
wangyuan eed27144f8 fight position 2020-04-16 14:11:44 +08:00
wangyuan 3435d2f7b7 soul 2020-04-07 17:09:10 +08:00
lvxinran 54adff8768 法宝协议删除,修改 2020-04-01 14:54:58 +08:00
lvxinran 1071da720c Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-04-01 14:17:52 +08:00
lvxinran 037e5b9324 法宝系统修改 2020-04-01 14:17:48 +08:00
zhangshanxue 203e661dae 月卡修改 2020-03-30 18:20:46 +08:00
zhangshanxue 6316d19184 月卡修改 2020-03-30 15:50:53 +08:00
zhangshanxue 0ca8a426b3 月卡修改 2020-03-30 14:42:22 +08:00
lvxinran de046f7ba0 戒灵秘宝时间添加 2020-03-21 15:14:05 +08:00
zhangshanxue bafc97f901 Task【ID1005460】【玩法需求】猎妖之路 协议提交 2020-02-09 19:49:51 +08:00
zhangshanxue fd6e5257e8 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-01-14 15:48:29 +08:00
zhangshanxue be12edceb2 TASK【ID1005460】【玩法需求】猎妖之路 2020-01-14 15:48:22 +08:00
lvxinran a9b6874d90 工会红包加入公会职位字段 2020-01-10 15:37:46 +08:00
lvxinran e0cdfbaea8 红包发送时间 2020-01-10 14:17:39 +08:00
zhangshanxue 9862c48d3c TASK【ID1005460】【玩法需求】猎妖之路 2020-01-09 18:33:27 +08:00
zhangshanxue 1ff66688f3 TASK【ID1005460】【玩法需求】猎妖之路 2020-01-09 15:00:48 +08:00
zhangshanxue 3ee5814078 TASK【ID1005460】【玩法需求】猎妖之路 2020-01-08 17:24:58 +08:00
zhangshanxue a5f3b18316 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-01-08 16:19:28 +08:00
zhangshanxue 7374daa280 TASK【ID1005460】【玩法需求】猎妖之路 2020-01-08 16:19:22 +08:00
lvxinran 6710e5553e 红包物品Id 2020-01-08 16:19:00 +08:00
lvxinran 8516196ccb 红包id修改 2020-01-08 11:13:17 +08:00
lvxinran d5a71a5b3d 公会红包协议 2020-01-07 15:56:52 +08:00
lvxinran 8e5e26a4fc 排行榜公会图腾 2019-12-27 11:43:41 +08:00
lvxinran 163ef4fef8 vip协议 2019-12-26 15:55:49 +08:00
wangyuan db98e1a1de Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-12-24 16:35:23 +08:00
wangyuan 9a7c5c8524 双方信息 2019-12-24 16:35:20 +08:00
zhangshanxue 1db2718e92 【ID1005331】【星级成长礼】 2019-12-24 15:45:04 +08:00
wangyuan 146a7019f3 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-12-20 13:55:20 +08:00
wangyuan 6c13822f6e 是否是当前竞猜信息 2019-12-20 13:55:13 +08:00
zhangshanxue cf2eaed3ff TASK【ID1005242】 【选人起名】 协议提交 2019-12-19 11:16:41 +08:00
wangyuan 628899c397 fix 2019-12-18 15:52:12 +08:00
wangyuan 9d89c4f395 position 2019-12-18 15:50:27 +08:00
wangyuan 8992abe254 删除无效协议 2019-12-17 17:59:25 +08:00
lvxinran da3b00028f 排行榜协议 2019-12-17 10:50:47 +08:00
wangyuan 941f5511a1 add comment 2019-12-16 16:46:28 +08:00
wangyuan f2a19b406c add id 2019-12-16 16:45:21 +08:00
wangyuan 9c9e11995b teamid 2019-12-16 14:08:16 +08:00
wangyuan e0e31cc753 观看决赛信息 2019-12-13 20:37:41 +08:00
wangyuan f79c872bc7 battle detail 2019-12-13 19:41:52 +08:00
lvxinran 8cbd8af99c 迷宫寻宝协议 2019-12-12 15:17:01 +08:00
zhangshanxue 3f5af63f28 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-12-12 11:00:54 +08:00
zhangshanxue f35e16443d Task【ID1005229】【特权调整】协议提交 2019-12-12 11:00:47 +08:00
wangyuan 1f30567fa1 修正竞猜信息 2019-12-12 10:53:32 +08:00
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