Commit Graph

141 Commits (master_haizei)

Author SHA1 Message Date
wangyuan 3e66064380 fix car team info 2020-05-08 14:03:30 +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 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 6fc05450d3 祭祀 2020-05-07 14:09:10 +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 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
lvxinran 236504ee2c 点赞协议 2020-01-09 14:52:20 +08:00
lvxinran de55c15f1c 红包详情页信息 2020-01-08 16:32:10 +08:00
lvxinran 49899fbc67 红包协议修改 2020-01-08 10:55:03 +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
wangyuan 2796f95060 性别 2019-12-27 14:50:44 +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 d23cce5040 申请公会加头像信息 2019-10-17 14:00:18 +08:00
lvxinran 151b367745 头像修改 2019-10-16 22:02:49 +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
lvxinran c59b9c9d1b 公会战公会id 2019-09-24 12:35:36 +08:00
lvxinran ce656e5bbd 公会战协议 2019-09-27 12:45:47 +08:00
lvxinran 583728a0b7 公会协议 2019-09-13 12:21:39 +08:00
lvxinran d3e076e850 星数添加 2019-09-12 17:14:59 +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
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 0364d1d95f 公会图腾协议,公会战绩协议 2019-08-24 23:01:32 +08:00
lvxinran 5025a1effb 公会战buff修改 2019-08-26 10:06:06 +08:00
lvxinran 5db06abb40 公会战协议 2019-08-21 11:07:39 +08:00
lvxinran d94e8e3970 功绩剩余次数提交,敌方攻击日志提交 2019-08-20 08:40:24 +08:00
lvxinran 3694977e19 公会战总战绩 2019-08-18 01:26:08 +08:00
lvxinran 9abc2c188c 公会战血量为0indication 2019-08-17 11:31:18 +08:00
lvxinran 42d9d23ec7 首次10连协议 2019-08-20 07:06:05 +08:00
lvxinran 6ef47bebdb 公会战对战 2019-08-15 10:52:33 +08:00
lvxinran 822fec2cb2 公会战请求阶段信息 2019-08-13 15:00:38 +08:00
lvxinran 906590cdc2 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-12 17:26:30 +08:00
lvxinran 0ba93477c8 公会战协议修改 2019-08-12 17:26:26 +08:00
wangyuan dffc55eaf7 玩家走路信息 2019-08-12 17:11:19 +08:00
lvxinran 92c4569067 公会获取对手信息协议增加 2019-08-12 16:04:45 +08:00
lvxinran 9af395e4da 查看公会信息 2019-08-12 14:59:14 +08:00
lvxinran 4df16edaeb 公会协议 2019-08-09 16:36:16 +08:00
lvxinran 2abb0fb55f Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-09 15:36:19 +08:00
lvxinran cd87912fb3 公会战协议修改 2019-08-09 15:36:15 +08:00
wangyuan 36f8abb998 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-08-09 15:02:29 +08:00
wangyuan 421701bdcf family indication 2019-08-09 15:02:09 +08:00
lvxinran d48cca2488 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-09 14:40:40 +08:00
lvxinran 12947b78a7 布防协议修改 2019-08-09 14:40:33 +08:00
wangyuan b276b090d7 family move name indication 2019-08-09 14:20:27 +08:00
wangyuan 4f75ba96ee 公会人员行走 2019-08-09 14:15:33 +08:00
lvxinran 5a3ac6a8e3 调整布防协议 2019-08-08 16:59:19 +08:00
lvxinran 8978a5be54 公会战协议 2019-08-07 17:17:44 +08:00
lvxinran 5b0875c749 公会协议 2019-08-07 16:00:41 +08:00
lvxinran dc3ffc9860 工会战协议 2019-08-07 13:44:18 +08:00
lvxinran d5f6bcd391 公会战布防协议 2019-08-07 11:27:24 +08:00
wangyuan 531f6b729e 解散公会开始时间 2019-08-03 18:02:21 +08:00
wangyuan d5f454fef8 解散公会开始时间 2019-08-03 17:37:46 +08:00
wangyuan f2a3c76e6f repeated -> optional 2019-08-03 15:13:07 +08:00
wangyuan 82961ba9f4 fix 2019-08-03 11:57:55 +08:00
wangyuan 83f77f4940 success or fail for family notice 2019-08-03 11:55:02 +08:00
wangyuan 3bb6903c21 family update 2019-08-03 10:59:47 +08:00
wangyuan e8461ef49b family change indicaiton 2019-08-02 18:41:25 +08:00
wangyuan 59230cdb0c 修改公会加入类型 2019-08-02 17:52:19 +08:00
wangyuan 2dcd2e2afa 公会宣言 2019-08-02 17:45:52 +08:00
wangyuan 137b294e8a family indication 2019-08-02 14:36:27 +08:00
wangyuan ca23bed2fa family apply 2019-08-01 21:03:02 +08:00
wangyuan 15126d39ae family 2019-08-01 19:53:33 +08:00
wangyuan 7863f2c302 fix family 2019-08-01 17:56:31 +08:00
wangyuan 80fa28f767 family join 2019-08-01 15:16:22 +08:00
wangyuan c49a9d6c3f family 2019-07-31 17:43:51 +08:00