Commit Graph

1161 Commits (873647b9be3e6462e1507eb92ed1937254698762)
 

Author SHA1 Message Date
lvxinran 76ed52a5d0 Merge branch 'master' into equip_develop
# Conflicts:
#	protos/HeroInfoProto.proto
2020-08-16 14:23:08 +08:00
zhangshanxue 3840b1a2f1 Merge branch 'master_test' 2020-08-12 15:20:55 +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 056ca266c7 Merge branch 'master' into master_test 2020-08-03 18:23:42 +08:00
zhangshanxue 18e770e0c8 Merge branch 'master' into master_test 2020-08-25 19:27:00 +08:00
lvxinran 4c499ce319 排行榜类型修改 2020-07-31 16:19:53 +08:00
lvxinran 9ae4c5bc5c 炸弹协议修改 2020-07-29 14:50:58 +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
lvxinran 49e9342dbc Merge branch 'master' into master_test 2020-07-25 15:15:06 +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 46511596ff Merge branch 'master' into master_test 2020-07-22 11:05:30 +08:00
zhangshanxue 1ace57ac1b Merge branch 'master' into master_test 2020-07-25 12:40:07 +08:00
lvxinran dc4f7d235d 本次不能参加十绝阵协议 2020-07-20 10:58:37 +08:00
zhangshanxue e947a4c97f Merge branch 'master_test' of http://60.1.1.230/backend/jieling_protocol into master_test 2020-07-17 21:34:48 +08:00
zhangshanxue 59d5ddb494 Merge branch 'master_test' of http://60.1.1.230/backend/jieling_protocol into master_test 2020-07-17 21:34:40 +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 273cf61338 Revert "Revert "Hero协议修改""
This reverts commit 29fe363ba0.
2020-07-10 17:41:38 +08:00
lvxinran 6eb9a711d8 Merge branch 'master' into master_test 2020-07-10 16:54:08 +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
zhangshanxue 29fe363ba0 Revert "Hero协议修改"
This reverts commit f60867732c.
2020-07-03 18:24:03 +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