Commit Graph

469 Commits (b6811294a3aeb24c6b772a386026a101aaba4fc3)
 

Author SHA1 Message Date
lvxinran b6811294a3 获取异妖编队协议修改 2019-08-05 20:42:26 +08:00
lvxinran edc539754c 获取协议 2019-08-05 20:36:55 +08:00
lvxinran 83ecb337f2 冲突处理 2019-08-05 20:31:40 +08:00
lvxinran 6ecb1bfe9d 获取第一编队信息 2019-08-05 20:31:20 +08:00
lvxinran 1764c308d7 获取第一编队 2019-08-05 20:28:40 +08:00
zhangshanxue 655bce376b Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-05 18:34:11 +08:00
zhangshanxue 36269c24a8 签到 2019-08-05 18:33:55 +08:00
zhangshanxue 7d53c7aad1 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-07 09:38:58 +08:00
zhangshanxue f6f3d363d7 达人协议 2019-08-07 09:38:53 +08:00
wangyuan 1adee6d68e giftgoods time 2019-08-05 17:04:54 +08:00
lvxinran 9da9b92d8e 无尽协议 2019-08-05 16:22:56 +08:00
wangyuan 531f6b729e 解散公会开始时间 2019-08-03 18:02:21 +08:00
wangyuan d5f454fef8 解散公会开始时间 2019-08-03 17:37:46 +08:00
wangyuan 6c8ca3156f 退出公会 2019-08-03 16:15:02 +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 f49fed39c1 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-08-03 11:55:16 +08:00
wangyuan 83f77f4940 success or fail for family notice 2019-08-03 11:55:02 +08:00
lvxinran 92097831a7 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-03 11:33:47 +08:00
lvxinran ad6a305b8e 无尽副本刷新行动力 2019-08-03 11:33:34 +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 529a74da6f fix 2019-08-02 18:12:37 +08:00
wangyuan 59230cdb0c 修改公会加入类型 2019-08-02 17:52:19 +08:00
wangyuan d6939d5556 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-08-02 17:46:12 +08:00
wangyuan 2dcd2e2afa 公会宣言 2019-08-02 17:45:52 +08:00
zhangshanxue bbc027484c Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-02 14:42:46 +08:00
zhangshanxue 6906e62757 活动进度推送 2019-08-02 14:42:43 +08:00
wangyuan 137b294e8a family indication 2019-08-02 14:36:27 +08:00
zhangshanxue e0e2793e8b Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol
# Conflicts:
#	protos/CommonProto.proto
#	protos/MessageTypeProto.proto
2019-08-02 13:28:09 +08:00
zhangshanxue 9b5246ce0a 战力排行 2019-08-02 13:26:05 +08:00
lvxinran 399596c8b8 修改 2019-08-02 11:12:27 +08:00
lvxinran cc4baf23fa 标志协议 2019-08-02 11:11:26 +08:00
lvxinran 32169e38dd 删除标记 2019-08-02 11:06:00 +08:00
wangyuan ca23bed2fa family apply 2019-08-01 21:03:02 +08:00
lvxinran 147e970a16 设置标志协议 2019-08-01 20:52:43 +08:00
wangyuan 62cd526772 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-08-01 19:53:49 +08:00
wangyuan 15126d39ae family 2019-08-01 19:53:33 +08:00
lvxinran 984bb32665 WUJIN 2019-08-01 18:43:04 +08:00
lvxinran d7bf2a8c0e Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-01 18:22:47 +08:00
lvxinran bd95c213dc 协议提交 2019-08-01 18:22:43 +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
lvxinran b3d7f35ca1 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-01 13:57:38 +08:00
lvxinran bde11a7d0f 无尽副本协议 2019-08-01 13:57:31 +08:00
zhangshanxue d657ae3822 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-01 11:58:44 +08:00
zhangshanxue 09ca37893f 招财猫 2019-08-01 11:58:19 +08:00
wangyuan a109e67d2c family base 2019-08-01 11:51:34 +08:00
zhangshanxue f0504aeef5 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-07-31 18:14:39 +08:00
zhangshanxue 0e9f57ca9c 招财猫协议 2019-07-31 18:13:45 +08:00