Commit Graph

1073 Commits (98f6e88e027c5dafa1fae68369760a533ab8d86c)

Author SHA1 Message Date
lvxinran f964fc4cb9 地图信息修改 2020-09-04 00:40:53 +08:00
lvxinran 0fd4f90df5 协议修改 2020-10-16 02:52:11 +08:00
lvxinran 309e0ae6e6 试炼副本信息修改 2020-10-16 02:40:23 +08:00
lvxinran f675889b27 请求刷新 2020-09-10 15:01:31 +08:00
lvxinran 795ab5d54b 公会副本刷新 2020-09-10 11:25:41 +08:00
lvxinran 5c3b89ea6b Merge branch 'master' into 公会副本 2020-08-22 15:41:06 +08:00
lvxinran 9f59b12cf0 发送号令 2020-08-21 17:27:46 +08:00
lvxinran f32e683ffa buff消息号 2020-08-21 10:56:15 +08:00
lvxinran caed40aea9 公会副本buff协议 2020-08-21 10:40:19 +08:00
lvxinran 8cf645a5e5 伤害值添加 2020-08-28 15:16:20 +08:00
lvxinran 81119d62f1 公会副本协议 2020-08-28 13:42:07 +08:00
lvxinran 6d1c5336bd 公会副本协议提交 2020-08-21 16:52:44 +08:00
zhangshanxue ae58e819a2 诛仙协议提交 2020-08-20 19:38:00 +08:00
lvxinran aff7873a04 地图协议 2020-08-28 14:47:18 +08:00
zhangshanxue dd53a67961 充值类型更换 2020-08-14 23:40:40 +08:00
zhangshanxue ed7525920e 类型 2020-08-14 22:39:31 +08:00
lvxinran 76ed52a5d0 Merge branch 'master' into equip_develop
# Conflicts:
#	protos/HeroInfoProto.proto
2020-08-16 14:23:08 +08:00
lvxinran 3febe141a2 宝镜状态修改推送提交 2020-08-10 16:23:41 +08:00
lvxinran 7fb732d262 通关id修改 2020-08-13 10:00:44 +08:00
zhangshanxue fb2a59d7a1 英雄置换 2020-08-10 15:20:26 +08:00
zhangshanxue 10af265bfb 英雄置换 2020-08-10 10:48:51 +08:00
lvxinran 20e0f4ded7 挑战战斗数据添加 2020-08-07 15:03:57 +08:00
lvxinran 504a89c2e6 错误协议修改 2020-08-07 19:28:40 +08:00
lvxinran 09e57f804a 轩辕宝镜协议 2020-08-07 16:45:01 +08:00
lvxinran fe99762cac 法宝归元修改 2020-08-05 15:04:46 +08:00
lvxinran 6fe9795eb5 法宝归元协议提交 2020-08-05 15:03:36 +08:00
lvxinran 9ae4c5bc5c 炸弹协议修改 2020-07-29 14:50:58 +08:00
lvxinran 4c499ce319 排行榜类型修改 2020-07-31 16:19:53 +08:00
zhangshanxue f4c96fad9d 先手 2020-07-25 21:35:01 +08:00
zhangshanxue 29b90e0943 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-07-25 21:40:58 +08:00
zhangshanxue 6d2559ac82 我的下注 2020-07-25 21:40:50 +08:00
zhangshanxue f7194e06f2 幸运探宝次数 2020-07-27 21:32:32 +08:00
zhangshanxue f5236d13c8 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-07-24 01:22:34 +08:00
zhangshanxue 6c52552e21 幸运探宝次数 2020-07-24 01:22:15 +08:00
lvxinran dc4f7d235d 本次不能参加十绝阵协议 2020-07-20 10:58:37 +08:00
lvxinran 608c5f847c 炸弹使用次数提交 2020-07-16 16:45:48 +08:00
lvxinran 23b6b64334 打点访客id 2020-07-13 10:46:13 +08:00
zhangshanxue b459a8e9e9 巅峰赛 2020-07-12 23:10:12 +08:00
zhangshanxue a8dea0d385 巅峰赛 2020-07-12 22:07:46 +08:00
zhangshanxue 4902f4bc16 巅峰赛 2020-07-16 23:41:14 +08:00
zhangshanxue fa22cffbb2 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-07-16 23:01:31 +08:00
zhangshanxue 63e3bd7dad 巅峰赛 2020-07-16 23:01:18 +08:00
lvxinran 1379ab4c0e 装备合成协议修改 2020-07-04 17:56:23 +08:00
lvxinran f60867732c Hero协议修改 2020-07-05 08:07:56 +08:00
lvxinran 2acd6c1aca Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-07-04 03:39:31 +08:00
zhangshanxue f7a48dc550 TASK 【ID1006484】竞技场进度奖励 2020-07-06 21:18:20 +08:00
zhangshanxue 2452696009 TASK 【ID1006484】竞技场进度奖励 2020-07-06 21:12:49 +08:00
lvxinran 9017883018 进图buff 2020-07-04 03:39:27 +08:00
lvxinran c148901ce3 天宫秘宝加入时间 2020-06-29 15:11:36 +08:00
lvxinran dd4bd0f970 英雄图鉴协议修改 2020-06-24 17:24:25 +08:00
lvxinran 7aa2ce1931 英雄公会技能信息添加 2020-06-26 00:26:54 +08:00
lvxinran 096706d868 小游戏消息号提交 2020-06-12 11:08:23 +08:00
lvxinran 492475a0a6 试炼小游戏协议 2020-06-12 10:56:27 +08:00
lvxinran da39657933 试炼本领奖协议 2020-06-10 03:01:20 +08:00
lvxinran eda1c5d18b 添加活动id 2020-06-08 22:39:32 +08:00
lvxinran 3c0310b7c7 排行性别添加 2020-06-05 15:28:23 +08:00
lvxinran 4bfcb2ed1a 排行榜第一名信息,膜拜信息协议 2020-06-05 11:22:10 +08:00
lvxinran 85d0661780 回春散次数添加 2020-06-03 17:14:10 +08:00
lvxinran 41814aa1ab 使用回春散协议 2020-06-03 11:06:33 +08:00
lvxinran 90e26227e3 拾取宝箱类型添加 2020-06-03 10:58:04 +08:00
lvxinran 4a58936d45 修改错误协议 2020-06-01 19:45:45 +08:00
lvxinran 81cf10d69b Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-06-01 19:41:34 +08:00
lvxinran bc5bb019d3 试炼本宝箱协议 2020-06-01 19:41:28 +08:00
zhangshanxue bc9b7a921d 战斗单元新增英雄星级 2020-06-01 15:48:22 +08:00
lvxinran 7182b2ea5b 传送门协议 2020-06-01 09:58:35 +08:00
lvxinran ed99cb1e68 回滚协议 2020-05-29 14:11:12 +08:00
lvxinran 507c2a2089 快速战斗数据 2020-05-29 11:26:42 +08:00
lvxinran f3f67a5da0 添加英雄等级 2020-05-28 15:39:28 +08:00
lvxinran 214bb42f80 试炼阵容相关协议 2020-05-26 16:28:24 +08:00
lvxinran eefc8482f5 修改结构 2020-05-25 11:03:08 +08:00
lvxinran 3c5a25f5d0 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-05-22 10:41:48 +08:00
zhangshanxue 7ffcf9618b Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化) 2020-05-22 19:07:31 +08:00
lvxinran 256b22e6cd 十绝阵第一名更改推送 2020-05-22 10:41:34 +08:00
lvxinran f8383e71b8 获取天宫秘宝积分 任务信息 2020-05-21 17:43:18 +08:00
zhangshanxue ae153f19c4 Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化) 2020-05-21 14:50:41 +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 6222e2792f Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-05-18 21:01:07 +08:00
zhangshanxue 0890629260 Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化) 2020-05-18 21:01:01 +08:00
wangyuan 5e313cd919 车迟上次玩耍时间 2020-05-18 14:32:18 +08:00
wangyuan d7eb01e38b delete unuse proto 2020-05-16 17:58:03 +08:00
zhangshanxue 286a502fb2 Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化) 2020-05-16 17:50:59 +08:00
wangyuan c3043da79e random card box 2020-05-16 16:42:35 +08:00
zhangshanxue fe2cec83c1 Task【新战斗版本】公会援助 2020-05-18 06:34:25 +08:00
zhangshanxue b571e09252 Task【新战斗版本】公会援助 协议提交 2020-05-16 10:19:13 +08:00
zhangshanxue c543df2495 Task【新战斗版本】公会援助 协议提交 2020-05-14 16:45:00 +08:00
zhangshanxue 6d0fc2dcfe Task【新战斗版本】公会援助 协议提交 2020-05-14 14:43:10 +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 fb2dd38d5b Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-05-13 09:50:11 +08:00
lvxinran 30e91f14a7 加入公会id 2020-05-20 21:16:46 +08:00
lvxinran 16856acb0d Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-05-18 22:38:36 +08:00
lvxinran d79fba06a6 翻拍信息添加用户名 2020-05-18 22:38:32 +08:00
zhangshanxue 265a5642cc Task【新战斗版本】公会援助 协议提交 2020-05-13 09:50:04 +08:00
zhangshanxue 6d9e76bf0f Task【新战斗版本】公会援助 协议提交 2020-05-12 10:20:03 +08:00
lvxinran f8bd8b13b4 十绝阵协议 2020-05-09 15:47:44 +08:00
lvxinran 88ab06e134 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-05-09 09:51:54 +08:00
lvxinran 80468999c7 最高伤害 2020-05-09 09:51:50 +08:00
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