Commit Graph

448 Commits (e8461ef49bd941544e015a4cc06825c014fbc2a2)
 

Author SHA1 Message Date
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
wangyuan 883713badc Merge branch 'master' of 60.1.1.230:backend/jieling_protocol
# Conflicts:
#	protos/CommonProto.proto
2019-07-31 17:44:54 +08:00
wangyuan c49a9d6c3f family 2019-07-31 17:43:51 +08:00
lvxinran c81581b51c 修改 2019-07-30 15:52:47 +08:00
lvxinran 9c42fa82ae Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-07-30 15:49:24 +08:00
lvxinran 052fc147dc 无尽副本协议 2019-07-30 15:49:12 +08:00
wangyuan 0f71b4ef26 关闭活动推送 2019-07-30 15:12:16 +08:00
wangyuan 30411073d0 activity update 2019-07-30 14:51:53 +08:00
lvxinran 34c93b9b68 协议提交 2019-07-25 19:09:54 +08:00
lvxinran 87f93324d6 头像框修改 2019-07-25 10:49:40 +08:00
lvxinran fbcbc3f146 云梦祈福刷新时间 2019-07-25 05:25:29 +08:00
lvxinran 3cbe6fb795 预览 2019-07-23 20:30:10 +08:00
wangyuan 9943482a86 dead times 2019-07-23 19:41:06 +08:00
wangyuan 10dd9af0e3 够买孙龙 2019-07-23 16:26:09 +08:00
wangyuan 280dfb67fc 商店推送 2019-07-23 15:32:16 +08:00
wangyuan 173afde77f 任务id 2019-07-23 14:49:21 +08:00
wangyuan 6250c4e956 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-07-23 11:20:05 +08:00
wangyuan 900ac5532d treasure task 2019-07-23 11:19:53 +08:00
lvxinran 633e0953a2 协议修改 2019-07-22 18:25:14 +08:00
lvxinran fb95a0c21a 云梦祈福协议修改 2019-07-22 18:13:32 +08:00
lvxinran 82932eb2ba 云梦祈福协议修改 2019-07-22 16:46:11 +08:00
lvxinran 6d94ca929a 云梦祈福协议提交 2019-07-22 16:06:36 +08:00