Commit Graph

1123 Commits (dab230df4f66c5c2eed4b97cbd1f4506969bb855)

Author SHA1 Message Date
lvxinran 17926318d2 Merge branch 'master_test' into master_test_gn 2021-04-12 19:11:26 +08:00
mengchengzhen 7c330aaacb 聊天队伍称号添加 2021-04-12 10:22:00 +08:00
lvxinran a0bf47d562 福星高照购买协议 2021-04-19 18:38:14 +08:00
whb 0b44deb17f Merge branch 'master_test_gn' into master_test_gn_whb
# Conflicts:
#	protos/PlayerInfoProto.proto
2021-03-30 13:52:11 +08:00
mengchengzhen c79335fc96 坐骑加性别 2021-03-29 14:55:24 +08:00
mengchengzhen b5836049e9 称号,皮肤,坐骑 2021-03-29 12:00:56 +08:00
lvxinran dacc8158bf Merge branch 'master_online_gn' into master_test_gn 2021-03-31 09:15:07 +08:00
lvxinran 63ded8190b 百分比类型修改 2021-03-31 09:04:09 +08:00
lvxinran ea4fc15464 是否需要刷新次数 2021-03-23 03:29:21 +08:00
whb ad93e085c0 修改激活图鉴名字 2021-03-22 14:12:43 +08:00
lvxinran 6c66acc9b4 充值成功推送 2021-03-20 21:11:28 +08:00
whb 431f43533f 更改协议 2021-03-19 18:00:01 +08:00
whb 2a86a29141 更改羁绊协议 2021-03-19 16:32:03 +08:00
whb 88b5cd5baf 更改了羁绊协议 2021-03-19 15:55:15 +08:00
whb 014e2b8df4 更改 2021-03-19 10:27:35 +08:00
whb f5c8805e34 羁绊协议2 2021-03-16 15:52:44 +08:00
whb ac2298f958 羁绊协议 2021-03-16 15:49:15 +08:00
lvxinran 437f548ae8 物品数量协议修改 2021-03-10 17:28:43 +08:00
lvxinran ce6d798346 Merge branch 'master_test_gn' into master_test_gn_datatype 2021-03-10 16:06:04 +08:00
lvxinran cfa7725e6a Merge branch 'master_test_hw' into master_test_hw_i18n 2021-03-05 18:17:31 +08:00
lvxinran e49eea9189 起名本地化修改 2021-03-06 09:09:24 +08:00
lvxinran 73cdb84bd9 国内数量修改 2021-02-28 13:27:15 +08:00
mengchengzhen 6f50d05cf1 Merge branch 'master_kaifa_0217' into master_test_hw 2021-02-25 10:25:01 +08:00
mengchengzhen ca410469c4 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_protocol into master_test_hw 2021-02-25 10:20:00 +08:00
mengchengzhen e3e46aa97d 登陆确认协议 2021-02-25 10:19:56 +08:00
whb 4e44a45caf datetype 2021-02-23 16:03:05 +08:00
duhui 28000fe7b9 Merge branch 'master_test_hw' into master_test_hongmeng 2021-02-19 11:07:08 +08:00
mengchengzhen bac5744def rank+index 2021-02-02 11:19:10 +08:00
duhui b50accb065 一键领取邮件bug 2021-01-25 16:08:09 +08:00
lvxinran f4e2d373eb 扭转乾坤活动id 2021-01-21 10:16:59 +08:00
lvxinran 71f82b7206 修改提交 2021-01-21 10:07:50 +08:00
lvxinran 76f1ce345f 扭转乾坤协议 2021-01-21 10:06:39 +08:00
duhui 2161a310d3 无用协议删除 2021-01-18 13:48:50 +08:00
duhui 35c9ac2b7a 获取头像框列表 2021-01-18 13:40:34 +08:00
duhui 28d9f3be73 无用协议删除 2021-01-15 18:20:20 +08:00
duhui e1bd3f7daf 头像框到期推送,和获取玩家信息添加 2021-01-15 15:07:00 +08:00
duhui e7c935eef9 道具添加到期时间 2021-01-15 14:04:41 +08:00
duhui c8f842936e 巅峰赛,使用头像框 2021-01-15 10:43:22 +08:00
duhui f83944c1b8 Merge branch 'master_test_hw' into master_test_hongmeng 2021-01-13 11:50:08 +08:00
duhui 54c4419ac4 心魔试炼排行奖励 2021-01-12 17:46:41 +08:00
duhui 254dbd7800 Merge branch 'master_test_hw' into master_test_hongmeng 2021-01-07 13:44:47 +08:00
lvxinran 3c8f2c0d75 保存森罗阵容时 返回数据 2021-01-04 10:05:35 +08:00
duhui 625bc10076 鸿蒙碑新手引导推送 2020-12-30 16:38:35 +08:00
duhui 6055543e05 天宫探险加锁 2020-12-30 16:18:02 +08:00
lvxinran 1f97853569 公会技能等级校验协议 2020-12-29 10:56:47 +08:00
lvxinran 4a4e08c430 公会技能添加协议 2020-12-29 10:49:25 +08:00
duhui 2a4dfa7c28 鸿蒙阵协议修改1.1 2020-12-28 16:49:14 +08:00
lvxinran 748a0109d2 登陆时副本信息 2021-01-01 17:31:36 +08:00
duhui 3ba75cee1d 鸿蒙阵,推送添加共鸣列表 2020-12-26 14:42:08 +08:00
lvxinran aed3441c5d 炸小怪添加 2020-12-24 16:15:24 +08:00
zhangshanxue 1ff6327aa2 性别信息 2021-02-20 17:21:59 +08:00
zhangshanxue afe34abe0a 跨服和零点推送 2021-01-18 01:27:28 +08:00
jiahuiwen d29973c0a8 鸿蒙信息单独获取 推送 2020-12-21 16:02:45 +08:00
jiahuiwen 3b9b1da034 花费妖晶清除共鸣冷却时间 2020-12-17 15:02:32 +08:00
duhui 3329b730d6 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_protocol into master_test_hw 2020-12-17 10:01:06 +08:00
duhui 7632c96830 战报功能和公告 2020-12-17 10:00:50 +08:00
jiahuiwen 84b1f634d1 添加注释 2020-12-16 10:56:00 +08:00
lvxinran 1522ebc97b Merge branch 'master_test_hw_arean' of http://60.1.1.230/backend/jieling_protocol into master_test_hw_arean 2020-12-16 10:17:09 +08:00
zhangshanxue b5ba574d5f 跨服服务器 2021-01-09 01:54:37 +08:00
zhangshanxue 0f0b2825a2 跨服服务器 2021-01-02 22:45:28 +08:00
zhangshanxue 3d620508e6 跨服服务器 2021-01-02 22:40:11 +08:00
lvxinran 640317bca5 获取gs奖励协议号 2020-12-16 10:17:04 +08:00
jiahuiwen c250bdea23 鸿蒙协议修改 2020-12-16 10:07:33 +08:00
lvxinran 5fdaade433 十绝阵协议修改 2020-12-15 16:34:31 +08:00
zhangshanxue 4f03c96481 Merge branch 'master_test_hw' into master_test_hw_arean 2020-12-15 15:27:03 +08:00
zhangshanxue 4788db6710 世界等级推送 2020-12-15 14:28:03 +08:00
zhangshanxue 5b1f9f6b3e Merge branch 'master_test_hw_arean' of http://60.1.1.230/backend/jieling_protocol into master_test_hw_arean 2020-12-15 11:11:49 +08:00
zhangshanxue 90ec8281cc 世界等级推送 2020-12-15 11:11:43 +08:00
lvxinran a0ce3e163c 地图协议修改 2020-12-12 16:23:12 +08:00
lvxinran f30caed97d Merge branch 'master_test_hw' into master_test_hw_arean
# Conflicts:
#	protos/MessageTypeProto.proto
2020-12-12 14:11:59 +08:00
lvxinran e63792bf7b 排行榜区服 2020-12-12 13:51:31 +08:00
lvxinran 1919fce306 Merge branch 'master_test_hw_arean' of http://60.1.1.230/backend/jieling_protocol into master_test_hw_arean
# Conflicts:
#	protos/MessageTypeProto.proto
2020-12-12 11:14:23 +08:00
lvxinran a8506cb603 跨服十绝阵协议 2020-12-12 11:13:21 +08:00
zhangshanxue df927056d0 跨服服务器 2020-12-10 19:02:48 +08:00
duhui 8ee13742ed 神树升级协议,chat加了个注释,不影响 2020-12-10 14:47:50 +08:00
zhangshanxue 13883675a0 Merge branch 'master_test_hw_arean' of http://60.1.1.230/backend/jieling_protocol into master_test_hw_arean 2020-12-07 21:16:39 +08:00
zhangshanxue c80bf0d3f5 跨服服务器 2020-12-07 21:16:31 +08:00
lvxinran 9338b5e259 Merge branch 'master_test_hw_arean' of http://60.1.1.230/backend/jieling_protocol into master_test_hw_arean 2020-12-07 18:11:16 +08:00
lvxinran 66c83402e0 十绝阵排行 2020-12-07 18:11:11 +08:00
zhangshanxue 26d66cc1ab 跨服服务器 2020-12-04 15:44:46 +08:00
zhangshanxue a2ce85528a 跨服服务器 2020-12-04 14:14:19 +08:00
zhangshanxue 2bb71406f8 跨服服务器 2020-12-04 14:01:22 +08:00
zhangshanxue bb1b5008ea 跨服服务器 2020-12-04 11:36:02 +08:00
zhangshanxue dbc6029ff4 跨服服务器 2020-12-04 11:25:59 +08:00
jiahuiwen 88d333c4d3 卸下共鸣返回倒计时 2020-12-04 10:33:04 +08:00
jiahuiwen f5dced2ba9 属性继承自哪个英雄 2020-12-03 17:10:58 +08:00
zhangshanxue 8edf73e4c6 跨服服务器 2020-12-03 14:19:53 +08:00
zhangshanxue da274d536e 跨服服务器 2020-12-02 18:52:17 +08:00
zhangshanxue 13e2cb8f21 跨服服务器 2020-12-02 10:26:24 +08:00
duhui 9bce76e321 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_protocol into master_test_hw 2020-12-02 10:08:34 +08:00
duhui bbe362ad8d 新将来袭 2020-12-02 10:08:19 +08:00
lvxinran 2bc2cefacc Revert "鸿蒙碑"
This reverts commit 39cc08884d.
2020-11-27 10:44:37 +08:00
lvxinran 25981545f3 鸿蒙协议 2020-11-27 10:43:33 +08:00
jiahuiwen 41534fb286 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_protocol into master_test_hw 2020-11-26 20:05:04 +08:00
jiahuiwen 39cc08884d 鸿蒙碑 2020-11-26 20:04:59 +08:00
lvxinran 5946da312a 背包已满提示,灵兽分页请求 2020-11-26 15:20:58 +08:00
zhangshanxue f6a2960653 跨服服务器 2020-11-25 15:51:35 +08:00
duhui 2fad3c176d 竞技场胜利失败掉落物品 2020-11-20 16:56:16 +08:00
zhangshanxue a18412872a 跨服服务器通信初版完成 2020-11-19 20:35:16 +08:00
lvxinran e9372b9b2a 灵兽活动选择up提交 2020-11-11 17:39:25 +08:00