Commit Graph

1123 Commits (dab230df4f66c5c2eed4b97cbd1f4506969bb855)

Author SHA1 Message Date
lvxinran 720d68cc6d Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-05-08 15:43:07 +08:00
lvxinran c55a657e3f 公会id改为公会名 2020-05-08 15:42:37 +08:00
wangyuan 22116b4247 add uid 2020-05-08 15:30:31 +08:00
wangyuan 919584a8d2 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2020-05-08 15:18:05 +08:00
zhangshanxue a3f52b860a Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-05-09 05:28:31 +08:00
zhangshanxue 752b0970b5 Task【ID1006175】【新战斗版本】宝物合成 2020-05-09 05:28:26 +08:00
wangyuan 5e70446bd2 car record 2020-05-08 15:16:03 +08:00
wangyuan 3e66064380 fix car team info 2020-05-08 14:03:30 +08:00
wangyuan f81c78a1d4 fightdata 2020-05-08 10:53:31 +08:00
wangyuan e7d245c9d8 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2020-05-07 18:02:27 +08:00
wangyuan 96fd9f5f43 车迟排序 2020-05-07 18:02:15 +08:00
zhangshanxue 5bb1ca6b9e 祭祀 2020-05-07 17:14:16 +08:00
zhangshanxue 88d9f17f20 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-05-07 16:42:38 +08:00
zhangshanxue 494ba6acbb 祭祀 2020-05-07 16:42:33 +08:00
wangyuan e247a91d6d 车轮时间 2020-05-07 16:13:22 +08:00
wangyuan 7ea1b9478c fix 2020-05-07 15:36:55 +08:00
wangyuan 284cfa6fab fix 2020-05-07 15:14:07 +08:00
wangyuan 4666c9f48f Merge branch 'master' of 60.1.1.230:backend/jieling_protocol
# Conflicts:
#	protos/Family.proto
2020-05-07 14:59:07 +08:00
wangyuan e72a9aa305 车迟玩法 2020-05-07 14:38:07 +08:00
zhangshanxue 62c9606cce Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-05-07 14:09:32 +08:00
zhangshanxue 6fc05450d3 祭祀 2020-05-07 14:09:10 +08:00
lvxinran 6be35e8116 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-05-07 14:01:27 +08:00
lvxinran ba7ebe0435 十绝阵协议号 2020-05-07 14:01:23 +08:00
zhangshanxue aad86e1794 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol
# Conflicts:
#	protos/Family.proto
2020-05-06 16:26:25 +08:00
zhangshanxue 548ddeeeec 祭祀 2020-05-06 16:25:38 +08:00
lvxinran 6d032dc6eb 十绝阵加入掉落 2020-05-06 16:20:09 +08:00
lvxinran 6699297335 十绝阵协议 2020-05-06 16:19:06 +08:00
lvxinran de480c5dcb 公会技能修改 2020-05-05 11:32:00 +08:00
lvxinran 2217310993 公会技能协议提交 2020-05-05 10:54:39 +08:00
wangyuan f9147f5006 hero position 2020-05-01 10:15:39 +08:00
lvxinran 09a6117269 宝器强化精炼协议 2020-04-26 16:46:53 +08:00
lvxinran 0ab1d34640 日常副本协议修改 2020-04-26 15:40:22 +08:00
lvxinran 5fce690941 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-04-26 14:59:46 +08:00
lvxinran ca2c652db2 宝器相关注释 2020-04-26 14:59:41 +08:00
wangyuan c49aaf01ac Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2020-04-26 13:58:56 +08:00
wangyuan 853bfa93f1 获取指定活动信息 2020-04-26 13:58:43 +08:00
lvxinran d431836781 战斗结果协议 2020-04-26 13:41:11 +08:00
lvxinran 3eb8dbf292 英雄身上宝器协议 2020-04-26 11:33:08 +08:00
lvxinran 65105fb39c 日常协议修改 2020-04-24 14:59:54 +08:00
lvxinran cb44c2f3cf 日常副本 协议 2020-04-24 14:12:23 +08:00
lvxinran f16efb6999 宝器协议 2020-04-24 11:04:29 +08:00
wangyuan eed27144f8 fight position 2020-04-16 14:11:44 +08:00
wangyuan f838f6e0b7 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2020-04-13 11:06:29 +08:00
wangyuan 87cf461653 soul merge response 2020-04-10 17:16:35 +08:00
wangyuan d749537e0a soul equip merge 2020-04-09 20:37:14 +08:00
wangyuan 3435d2f7b7 soul 2020-04-07 17:09:10 +08:00
wangyuan d771e0daaf soul 2020-04-07 14:55:44 +08:00
zhangshanxue bf6f1603bd Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-04-02 15:42:26 +08:00
zhangshanxue 26120b6bea Task 【ID1006033】【新战斗版本】后端装备合成系统 2020-04-02 15:42:08 +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 fe09b0eb49 月卡修改 2020-03-30 16:27:17 +08:00
zhangshanxue a4de374ae0 月卡修改 2020-03-30 16:14:04 +08:00
zhangshanxue 2819a37b08 月卡修改 2020-03-30 16:02:14 +08:00
zhangshanxue 6316d19184 月卡修改 2020-03-30 15:50:53 +08:00
zhangshanxue 0ca8a426b3 月卡修改 2020-03-30 14:42:22 +08:00
lvxinran afc5893be2 删除月刷新协议 2020-03-21 15:53:18 +08:00
lvxinran ee2fae31cd 戒灵秘宝时间获取 2020-03-21 15:22:13 +08:00
lvxinran de046f7ba0 戒灵秘宝时间添加 2020-03-21 15:14:05 +08:00
zhangshanxue 259bb1a755 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-02-09 19:49:59 +08:00
zhangshanxue bafc97f901 Task【ID1005460】【玩法需求】猎妖之路 协议提交 2020-02-09 19:49:51 +08:00
wangyuan 6ad8105209 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2020-01-15 14:57:58 +08:00
wangyuan a092cb3c93 guild last hurt 2020-01-15 14:57:51 +08:00
lvxinran 492b153df9 抢红包物品提示 2020-01-15 14:00:29 +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 14d8c4298a Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-01-09 18:33:34 +08:00
zhangshanxue 9862c48d3c TASK【ID1005460】【玩法需求】猎妖之路 2020-01-09 18:33:27 +08:00
wangyuan f551024b2d Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2020-01-09 16:05:26 +08:00
wangyuan 8457366a98 随机掉落 2020-01-09 16:05:19 +08:00
zhangshanxue 21e0efffb2 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-01-09 15:00:55 +08:00
zhangshanxue 1ff66688f3 TASK【ID1005460】【玩法需求】猎妖之路 2020-01-09 15:00:48 +08:00
lvxinran 9d1bfd3fb9 点赞协议修改 2020-01-09 14:56:35 +08:00
lvxinran 387ba568a4 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-01-09 14:52:25 +08:00
lvxinran 236504ee2c 点赞协议 2020-01-09 14:52:20 +08:00
wangyuan d6b3dc6e70 战斗数据 2020-01-09 13:42:17 +08:00
wangyuan 872858e537 fix 2020-01-09 11:29:13 +08:00
wangyuan a72435a650 hurt 2020-01-09 11:27:19 +08:00
zhangshanxue 4bcec77750 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-01-08 17:25:04 +08:00
zhangshanxue 3ee5814078 TASK【ID1005460】【玩法需求】猎妖之路 2020-01-08 17:24:58 +08:00
lvxinran c697ed7b09 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-01-08 16:32:16 +08:00
lvxinran de55c15f1c 红包详情页信息 2020-01-08 16:32:10 +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 5cd2eb26ce Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-01-08 10:55:08 +08:00
lvxinran 49899fbc67 红包协议修改 2020-01-08 10:55:03 +08:00
wangyuan 9b68880d65 工会boss注释 2020-01-07 17:19:04 +08:00
lvxinran afca89f797 抢红包修改 2020-01-07 16:55:31 +08:00
lvxinran 607a026919 删除多余协议 2020-01-07 15:59:25 +08:00
lvxinran 1431f81fc5 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-01-07 15:57:01 +08:00
lvxinran d5a71a5b3d 公会红包协议 2020-01-07 15:56:52 +08:00
wangyuan d6cd5e86b0 工会boss 2020-01-07 15:54:04 +08:00
lvxinran ad9f4cd7c1 排行榜活动id 2020-01-03 09:55:44 +08:00
lvxinran 02c8d09c29 特权推送 2019-12-31 11:14:13 +08:00
wangyuan 2796f95060 性别 2019-12-27 14:50:44 +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 4d55256880 竞猜成功通知 2019-12-20 14:49:12 +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
lvxinran 002099c495 取消协议 2019-12-20 10:48:02 +08:00
lvxinran 0073746e95 物品上限 2019-12-19 18:21:22 +08:00
lvxinran 27a3cb049c Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol
# Conflicts:
#	protos/PlayerInfoProto.proto
2019-12-19 18:12:41 +08:00
lvxinran 719a995fb5 检测物品上限 2019-12-19 18:11:51 +08:00
zhangshanxue 370e9e44a8 TASK【ID1005242】 【选人起名】 协议提交 2019-12-19 13:42:49 +08:00
zhangshanxue cf2eaed3ff TASK【ID1005242】 【选人起名】 协议提交 2019-12-19 11:16:41 +08:00
wangyuan e03457b29a 我的下注信息 2019-12-18 16:13:31 +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
wangyuan 2d87df9ab7 fix type 2019-12-17 17:38:26 +08:00
lvxinran da3b00028f 排行榜协议 2019-12-17 10:50:47 +08:00
lvxinran 3086a01ecf 刷新次数 2019-12-16 18:37:04 +08:00
wangyuan 6be9b93a9b fix arean id 2019-12-16 21:01:30 +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 ee2fff6407 fix rank 2019-12-16 13:32:08 +08:00
wangyuan 396e634bab add teamid 2019-12-16 13:23:28 +08:00
wangyuan e0e31cc753 观看决赛信息 2019-12-13 20:37:41 +08:00
wangyuan f79c872bc7 battle detail 2019-12-13 19:41:52 +08:00
wangyuan 5f1eeb3893 score 2019-12-13 10:56:09 +08:00
lvxinran 6a63aa9889 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-12-13 10:31:57 +08:00
lvxinran d2269b148e 迷宫寻宝刷新任务 2019-12-13 10:31:51 +08:00
wangyuan fb926a1dec Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-12-12 18:32:11 +08:00
wangyuan 05350722db 推送巅峰赛进度信息 2019-12-12 18:32:07 +08:00
lvxinran 0a3a72cfd2 派遣 2019-12-12 17:05:24 +08:00
lvxinran 5771aefa47 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-12-12 15:17:05 +08:00
lvxinran 8cbd8af99c 迷宫寻宝协议 2019-12-12 15:17:01 +08:00
wangyuan 9929a07d50 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-12-12 13:35:22 +08:00
wangyuan 52f285d6c2 下注 2019-12-12 13:35:17 +08:00
zhangshanxue 9062256d5c Task【ID1005229】【特权调整】协议提交 2019-12-12 11:14:32 +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
zhangshanxue 711afb239f Task【ID1005229】【特权调整】协议提交 2019-12-11 16:59:32 +08:00
wangyuan 904d8dece5 fix 2019-12-11 16:37:44 +08:00
wangyuan c27e6fcb7d 历史最高排名 2019-12-11 16:35:35 +08:00
wangyuan 9d50cb0de2 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-12-11 16:11:46 +08:00
lvxinran 08dabf6aeb 活动协议 2019-12-14 00:01:22 +08:00
lvxinran cd65719a14 限时抽卡 2019-12-13 08:08:27 +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 5cde7ab088 统一排行接口 2019-11-28 15:26:30 +08:00
wangyuan 0fe5639954 Merge branch 'online_1121' 2019-11-28 11:42:47 +08:00
lvxinran 2fc264ff6c 排行榜请求 2019-11-27 18:08:31 +08:00
wangyuan fe95fb1868 fix family 2019-11-27 17:31:16 +08:00
lvxinran 08720c6b21 修改公会名 2019-12-17 18:15:06 +08:00
lvxinran 0ea8ca16c7 排行榜修改重构 2019-11-27 10:48:14 +08:00
lvxinran 6b27b834b1 Merge branch 'online_1121' 2019-11-23 16:03:39 +08:00
lvxinran 0753b80ba7 坐骑升级 2019-11-21 11:21:59 +08:00
lvxinran 1ad236b30d 装饰协议 2019-11-20 17:54:37 +08:00
lvxinran d4108e898f 修改外观协议 2019-11-20 17:45:28 +08:00
zhangshanxue fa1b586de9 兽潮战斗数据给前端 2019-11-11 14:25:25 +08:00
wangyuan 8fee720400 fightresult 2019-11-06 16:09:34 +08:00
wangyuan 1dd1da8696 fight result 2019-11-06 15:48:59 +08:00
lvxinran dc57928be7 第一次进入副本协议 2019-10-31 11:40:56 +08:00
lvxinran 7cc6aa7324 好友详细信息是否申请过 2019-10-30 18:24:05 +08:00
lvxinran 25b713a21a 好友协议 2019-10-30 18:14:20 +08:00
wangyuan a8fb06850b 挂机奖励 2019-10-30 10:23:01 +08:00
wangyuan c3d8062979 关卡更新 2019-10-27 15:30:19 +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
lvxinran d23cce5040 申请公会加头像信息 2019-10-17 14:00:18 +08:00
wangyuan b021c791b1 guildname 2019-10-16 17:11:20 +08:00
wangyuan e5d161ad29 view hero detail 2019-10-15 16:51:59 +08:00
wangyuan f8215aeff0 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-10-15 16:13:54 +08:00
wangyuan e04b76c097 查看基本信息 2019-10-15 16:13:23 +08:00
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
wangyuan a2e0953db5 血战结算 2019-09-03 17:12:11 +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
lvxinran 7f1bcd6f6c 删除无用协议 2019-09-02 14:52:36 +08:00
lvxinran dd02ce729a 无尽强制出图 2019-09-02 14:48:59 +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 5f34029c2c end game 2019-08-30 10:42:12 +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 346cf13413 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-08-29 15:40:58 +08:00
wangyuan 242eafee62 英雄信息 2019-08-29 15:40:42 +08:00
zhangshanxue 98357cbda5 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-29 15:40:03 +08:00
zhangshanxue 9f43bbe246 改名推送 2019-08-29 15:39:13 +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 3dd093b38d 无尽副本推送刷新时间 2019-08-27 20:53:00 +08:00
lvxinran 58cd8a7fda 无尽本协议 2019-08-27 17:41:27 +08:00
lvxinran 09ed399879 出图indication 2019-09-02 13:56:21 +08:00
wangyuan ef215df187 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-08-26 13:56:20 +08:00
lvxinran 3d6d8d1b6e 战斗回访 2019-08-27 12:52:46 +08:00
lvxinran 886a049ec8 修改等级限制 2019-08-27 13:39:42 +08:00
lvxinran 7ce5e05576 加入公会限制 2019-08-27 13:20:15 +08:00
wangyuan 34d45d46a1 reconnect 2019-08-26 13:54:35 +08:00
lvxinran fdc126b7d7 公会战协议 2019-08-26 12:02:44 +08:00
lvxinran d1ab27c13f 工会**indicatioan 2019-08-24 11:16:55 +08:00
lvxinran 153725eebe 进攻血量修改 2019-08-22 11:26:04 +08:00
lvxinran d074b12c8a 攻击血量查看 2019-08-22 10:30:03 +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
lvxinran 5025a1effb 公会战buff修改 2019-08-26 10:06:06 +08:00
lvxinran 365f6e43bb 协议修改 2019-08-21 14:07:27 +08:00
wangyuan 79fdbbb3ff head 2019-08-21 12:18:14 +08:00
lvxinran 5db06abb40 公会战协议 2019-08-21 11:07:39 +08:00
zhangshanxue 8475c8dc20 异妖拍脸 2019-08-17 15:25:03 +08:00
lvxinran d94e8e3970 功绩剩余次数提交,敌方攻击日志提交 2019-08-20 08:40:24 +08:00
wangyuan 546dbab55f 秘境 2019-08-17 10:51:03 +08:00
lvxinran 03bef9616c 公会战协议修改 2019-08-18 01:28:33 +08:00
lvxinran 187b52874a Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-18 01:26:12 +08:00
lvxinran 3694977e19 公会战总战绩 2019-08-18 01:26:08 +08:00
lvxinran 9abc2c188c 公会战血量为0indication 2019-08-17 11:31:18 +08:00
zhangshanxue 5d0fa091f2 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-21 14:09:12 +08:00
zhangshanxue 83ee7fa095 妖兽来袭 2019-08-21 14:09:05 +08:00
lvxinran 05ae1c1e8a 个人战绩提交 2019-08-20 07:59:22 +08:00
lvxinran 42d9d23ec7 首次10连协议 2019-08-20 07:06:05 +08:00
lvxinran dcc17dbcf4 公会战血量 2019-08-19 11:03:57 +08:00