Commit Graph

722 Commits (8e5e26a4fce6c1a513a03c38d39d5f63dbaca81c)

Author SHA1 Message Date
zhangshanxue 27586e1166 一键装备 2019-09-11 10:23:20 +08:00
lvxinran 583728a0b7 公会协议 2019-09-13 12:21:39 +08:00
lvxinran d3e076e850 星数添加 2019-09-12 17:14:59 +08:00
lvxinran bfcab57c5a 无尽协议 2019-09-12 17:03:26 +08:00
lvxinran 44954ea9f4 无尽推送 2019-09-12 16:50:42 +08:00
zhangshanxue 0c5d3ddb24 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-09-09 18:26:01 +08:00
zhangshanxue 3331f847c5 问卷优化 2019-09-09 18:25:49 +08:00
wangyuan 84744378cb 倒计时 2019-09-09 17:28:33 +08:00
wangyuan 8c1f032800 血战积分 2019-09-07 17:16:36 +08:00
zhangshanxue 92af610f3c Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-09-07 12:56:06 +08:00
zhangshanxue adc409a1c7 魂印掉落 2019-09-07 12:55:58 +08:00
wangyuan ec68586cfa bloody state change 2019-09-06 17:07:53 +08:00
wangyuan e91b616a2a 血战领取积分奖励 2019-09-06 15:30:30 +08:00
wangyuan 858276118c fix 2019-09-06 14:16:06 +08:00
wangyuan 15e32fc5b7 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-09-06 10:39:29 +08:00
wangyuan 6718d2be66 跨服 2019-09-06 10:38:59 +08:00
lvxinran 755b1e9eac 无尽跳过战斗修改 2019-09-05 20:26:02 +08:00
zhangshanxue 5e0772f6a5 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-09-05 19:23:59 +08:00
zhangshanxue 4bb7c9e3d1 魂印协议 2019-09-05 19:23:51 +08:00
lvxinran bea0b890db 无尽设置战斗模式 2019-09-05 18:27:53 +08:00
lvxinran 411b3ad94c 排行榜修改 2019-09-05 17:21:49 +08:00
lvxinran 9a1f3db2d1 血战排行榜个人信息 2019-09-05 17:18:54 +08:00
zhangshanxue 486cef6996 魂印协议 2019-09-05 15:51:07 +08:00
lvxinran bbfc5ac5a0 血战排行修改 2019-09-05 12:00:29 +08:00
lvxinran eb8392ec42 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-09-05 11:38:08 +08:00
lvxinran b86da952b4 血战排行榜 2019-09-05 11:38:03 +08:00
zhangshanxue b34ff9908d Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol
# Conflicts:
#	protos/MessageTypeProto.proto
2019-09-05 10:19:16 +08:00
zhangshanxue 384983c641 魂印协议 2019-09-05 10:18:14 +08:00
lvxinran 130d91a17b Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-09-04 14:31:24 +08:00
lvxinran 6be6e25b67 无尽副本空地刷新小怪 2019-09-04 14:31:21 +08:00
zhangshanxue 480efcd287 问卷 2019-09-04 14:06:08 +08:00
zhangshanxue f0da57b9e6 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-09-04 11:55:06 +08:00
zhangshanxue e530927b93 问卷调查 2019-09-04 11:55:02 +08:00
lvxinran 36b74fcad7 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-09-03 20:47:42 +08:00
lvxinran 1998fad43c 修改我要变强 2019-09-03 20:47:38 +08:00
wangyuan bb7dfa4c91 head 2019-09-03 20:23:00 +08:00
wangyuan a2c6c67c65 基本信息 2019-09-03 19:34:46 +08:00
wangyuan a2e0953db5 血战结算 2019-09-03 17:12:11 +08:00
lvxinran 08b2db52ba Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-09-03 15:42:52 +08:00
lvxinran 271708a80c 法宝进阶 2019-09-03 15:42:47 +08:00
wangyuan d1b3377495 delete unuse msg 2019-09-03 14:56:43 +08:00
wangyuan 791d30d8be Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-09-03 14:53:52 +08:00
wangyuan 9b3ff7a88c kill nums 2019-09-03 14:53:37 +08:00
zhangshanxue c5be1b20ce Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-09-03 14:38:52 +08:00
zhangshanxue d5c648b3ab 问卷协议 2019-09-03 14:38:45 +08:00
wangyuan 2eeab08a8e scene msg 2019-09-03 13:44:20 +08:00
lvxinran de0d1e6934 法宝协议 2019-09-02 16:26:12 +08:00
lvxinran 7f1bcd6f6c 删除无用协议 2019-09-02 14:52:36 +08:00
lvxinran dd02ce729a 无尽强制出图 2019-09-02 14:48:59 +08:00
wangyuan 9fc6625449 path mienal 2019-09-02 14:28:46 +08:00
wangyuan b54982523e fight 2019-08-30 18:40:24 +08:00
zhangshanxue c9e4153dfd Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-30 16:48:43 +08:00
lvxinran 23fa28b119 我要变强协议 2019-09-01 16:13:59 +08:00
zhangshanxue 1e38d79616 战力头像 2019-08-30 16:48:39 +08:00
zhangshanxue 74f5090f76 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol
# Conflicts:
#	protos/CommonProto.proto
2019-08-30 11:37:32 +08:00
zhangshanxue ea06554658 手机绑定 2019-08-30 11:36:07 +08:00
wangyuan 5f34029c2c end game 2019-08-30 10:42:12 +08:00
wangyuan bb99c92e91 fix name 2019-08-30 10:02:25 +08:00
lvxinran 40ce4b02c0 无尽副本小地图信息 2019-08-31 20:48:45 +08:00
wangyuan c2e67f9668 add template 2019-08-29 16:20:41 +08:00
wangyuan 346cf13413 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-08-29 15:40:58 +08:00
wangyuan 242eafee62 英雄信息 2019-08-29 15:40:42 +08:00
zhangshanxue 98357cbda5 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-29 15:40:03 +08:00
zhangshanxue 9f43bbe246 改名推送 2019-08-29 15:39:13 +08:00
wangyuan 30c8d01845 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-08-29 15:36:33 +08:00
wangyuan e4a63b7e0e 阻挡点 2019-08-29 15:36:15 +08:00
lvxinran 6538b3668e 无尽副本协议修改 2019-08-29 05:39:59 +08:00
lvxinran 870ac2daf8 无尽副本信息 2019-08-29 02:59:42 +08:00
lvxinran 3dd093b38d 无尽副本推送刷新时间 2019-08-27 20:53:00 +08:00
lvxinran 58cd8a7fda 无尽本协议 2019-08-27 17:41:27 +08:00
lvxinran 09ed399879 出图indication 2019-09-02 13:56:21 +08:00
wangyuan ef215df187 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-08-26 13:56:20 +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
wangyuan 34d45d46a1 reconnect 2019-08-26 13:54:35 +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 d8c53ff77a Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-24 23:01:38 +08:00
lvxinran 0364d1d95f 公会图腾协议,公会战绩协议 2019-08-24 23:01:32 +08:00
lvxinran 5025a1effb 公会战buff修改 2019-08-26 10:06:06 +08:00
lvxinran 365f6e43bb 协议修改 2019-08-21 14:07:27 +08:00
wangyuan 79fdbbb3ff head 2019-08-21 12:18:14 +08:00
lvxinran 5db06abb40 公会战协议 2019-08-21 11:07:39 +08:00
zhangshanxue 8475c8dc20 异妖拍脸 2019-08-17 15:25:03 +08:00
lvxinran d94e8e3970 功绩剩余次数提交,敌方攻击日志提交 2019-08-20 08:40:24 +08:00
wangyuan 546dbab55f 秘境 2019-08-17 10:51:03 +08:00
lvxinran 03bef9616c 公会战协议修改 2019-08-18 01:28:33 +08:00
lvxinran 187b52874a Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-18 01:26:12 +08:00
lvxinran 3694977e19 公会战总战绩 2019-08-18 01:26:08 +08:00
lvxinran 9abc2c188c 公会战血量为0indication 2019-08-17 11:31:18 +08:00
zhangshanxue 5d0fa091f2 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-21 14:09:12 +08:00
zhangshanxue 83ee7fa095 妖兽来袭 2019-08-21 14:09:05 +08:00
lvxinran 05ae1c1e8a 个人战绩提交 2019-08-20 07:59:22 +08:00
lvxinran 42d9d23ec7 首次10连协议 2019-08-20 07:06:05 +08:00
lvxinran dcc17dbcf4 公会战血量 2019-08-19 11:03:57 +08:00
zhangshanxue 5cc33b0939 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-16 10:03:15 +08:00
zhangshanxue d7f1a51324 妖兽来袭 2019-08-16 10:02:49 +08:00
wangyuan f8d6e17ae1 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-08-14 17:24:50 +08:00
lvxinran 6ef47bebdb 公会战对战 2019-08-15 10:52:33 +08:00
lvxinran d6500575c5 公会战匹配成功提示 2019-08-15 09:22:12 +08:00
wangyuan 824d9d4596 已领取哪些好友体力 2019-08-19 11:43:28 +08:00
wangyuan 39a0cac945 更新秘盒赛季信息 2019-08-14 17:24:33 +08:00
lvxinran f36490863f Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-13 15:00:47 +08:00
lvxinran 822fec2cb2 公会战请求阶段信息 2019-08-13 15:00:38 +08:00
wangyuan 6e5d834841 更新玩家信息 2019-08-13 14:58:19 +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
wangyuan 499c2e87ee Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-08-12 16:22:15 +08:00
wangyuan 7ecb94bddd 更新状态 2019-08-12 16:21:45 +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
wangyuan 6132992f3f dropout 2019-08-09 16:13:08 +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 a37b194abb 布防indication协议 2019-08-09 14:54:46 +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 d8157bd9b3 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-07 17:17:48 +08:00
lvxinran 8978a5be54 公会战协议 2019-08-07 17:17:44 +08:00
zhangshanxue 04062c96b2 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-07 16:48:16 +08:00
zhangshanxue 63f0f27036 排行榜 2019-08-07 16:48:11 +08:00
lvxinran 5b0875c749 公会协议 2019-08-07 16:00:41 +08:00
lvxinran 0d54e14658 无尽副本已开启的地图信息 2019-08-07 15:11:35 +08:00
wangyuan dc3500d04c test 2019-08-07 14:47:10 +08:00
lvxinran dc3ffc9860 工会战协议 2019-08-07 13:44:18 +08:00
lvxinran d5f6bcd391 公会战布防协议 2019-08-07 11:27:24 +08:00
wangyuan c1cc40fa4e fight lastXy 2019-08-06 20:08:13 +08:00
wangyuan 3c7d3b5183 领取七日狂欢积分奖励 2019-08-06 18:16:16 +08:00
lvxinran 1f5fcc0276 协议修改 2019-08-06 10:36:00 +08:00
lvxinran e8f9862e18 第一编队信息协议修改 2019-08-06 10:16:51 +08:00
lvxinran f6379aadda 无尽副本出图统计 2019-08-06 09:59:38 +08:00
lvxinran 396ee7e85a Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-06 09:57:04 +08:00
lvxinran 8c700c695d 玩家第一编队信息 2019-08-06 09:57:00 +08:00
zhangshanxue 67b85d269d Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-05 21:05:31 +08:00
zhangshanxue bbdcc06c3e 签到 2019-08-05 21:05:23 +08:00
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
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