Commit Graph

854 Commits (eefc8482f5bebea72d122cb612fca40e36150d36)

Author SHA1 Message Date
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