Commit Graph

392 Commits (80ec97fbec34303d70b5ad1cad5bf300486225a5)

Author SHA1 Message Date
duhui 53ed787c69 类型抽卡次数 2021-06-30 10:22:38 +08:00
duhui eec110ad30 钻石抽总次数 2021-06-30 10:04:52 +08:00
duhui 4af35089b0 ccId 2021-06-09 14:12:26 +08:00
lvxinran 68becb2670 抽卡必出添加 2021-06-08 16:04:08 +08:00
xuexinpeng ab3a94dc6d 荣耀三星 2021-05-28 11:55:30 +08:00
lvxinran a84116efb9 Merge branch 'master_test_gn' into master_test_gn_endless 2021-07-03 01:21:32 +08:00
mengchengzhen b93d268293 福利红包 2021-05-26 11:16:06 +08:00
lvxinran 6eca63ddbc Merge branch 'master_test_gn' into master_test_gn_endless 2021-05-25 11:57:22 +08:00
xuexinpeng ffb1e0c064 心魔试炼 2021-05-25 11:49:29 +08:00
xuexinpeng 8ed31b55e3 Merge branch 'master_test_gn_hardstage' into master_test_gn
# Conflicts:
#	protos/CommonProto.proto
#	protos/PlayerInfoProto.proto
2021-05-24 11:15:54 +08:00
mengchengzhen 0e70baf5b2 福利红包 2021-05-20 14:35:08 +08:00
mengchengzhen 873647b9be 福利红包 2021-05-20 11:15:27 +08:00
xuexinpeng 1c5a8f74cb 特权等级奖励 2021-05-20 10:09:17 +08:00
xuexinpeng 833fa7d1ad 等级奖励 2021-05-19 19:03:20 +08:00
xuexinpeng c200c25b36 vip等级奖励 2021-05-19 18:36:34 +08:00
lvxinran 090998764d 无尽副本地图id 2021-05-18 16:58:32 +08:00
mengchengzhen 6ee55ef495 福利红包 2021-05-18 14:21:19 +08:00
lvxinran e52abb9c4e 经验修改 2021-05-17 21:07:30 +08:00
xuexinpeng d31120889d 合并 2021-05-17 11:09:08 +08:00
xuexinpeng 94508b47cf 山河社稷 2021-05-13 21:42:54 +08:00
xuexinpeng 4d3fc14eea 山河社稷 2021-05-13 21:03:30 +08:00
xuexinpeng 8fc7bd90c0 山河社稷 2021-05-13 17:33:52 +08:00
duhui b33c4d70b8 修行玩法 2021-05-12 18:03:07 +08:00
mengchengzhen c94fe904bf 山河社稷图 2021-05-10 10:08:10 +08:00
mengchengzhen d0277fe533 新礼包推送 2021-04-26 10:45:36 +08:00
mengchengzhen 6deaeac11f 装备升星(云游商人) 2021-04-16 17:16:59 +08:00
lvxinran 7b1da884cf 读取邮件协议 2021-04-12 21:59:56 +08:00
mengchengzhen b5836049e9 称号,皮肤,坐骑 2021-03-29 12:00:56 +08:00
lvxinran 6c66acc9b4 充值成功推送 2021-03-20 21:11:28 +08:00
duhui df7f70ea43 Merge branch 'master_test_hw' into master_test_hw_four_challenge 2021-03-08 15:18:50 +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
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
duhui 28000fe7b9 Merge branch 'master_test_hw' into master_test_hongmeng 2021-02-19 11:07:08 +08:00
duhui 83f3fa43cd 四灵协议修改 2021-02-05 16:56:23 +08:00
duhui 2d0a316d3b 四灵试炼推送协议 2021-02-05 16:52:06 +08:00
duhui ebed66d682 四灵协议修改 2021-02-04 16:35:23 +08:00
duhui ccf082da15 四灵,回放记录,玩家复数 2021-02-03 16:54:42 +08:00
duhui 1b5235ea6a 四灵,获取战斗记录 2021-02-03 16:35:23 +08:00
duhui ffd0816f96 四灵试炼协议修改 2021-02-03 16:15:22 +08:00
duhui 8fe2a8d43f 四灵试炼协议 2021-02-03 10:37:27 +08:00
duhui 1bf6776347 Merge branch 'master_test_tree' into master_test_hw_four_challenge 2021-02-12 14:30:13 +08:00
duhui 80d5ff8264 Merge branch 'master_test_hw' into master_test_hw_four_challenge 2021-02-12 14:16:33 +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
duhui 8e30d2ed51 bug修改 2021-01-21 16:27:35 +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 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
jiaoyangna db42a5f6d9 四灵协议添加 2021-01-12 17:48:49 +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
duhui 6055543e05 天宫探险加锁 2020-12-30 16:18:02 +08:00
zhangshanxue afe34abe0a 跨服和零点推送 2021-01-18 01:27:28 +08:00
jiahuiwen d29973c0a8 鸿蒙信息单独获取 推送 2020-12-21 16:02:45 +08:00
duhui 8bc2e1421c 神树 2020-12-18 16:14:11 +08:00
lvxinran b97e312785 四灵试炼协议 2020-12-16 11:26:23 +08:00
zhangshanxue b5ba574d5f 跨服服务器 2021-01-09 01:54:37 +08:00
jiahuiwen c250bdea23 鸿蒙协议修改 2020-12-16 10:07:33 +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 f30caed97d Merge branch 'master_test_hw' into master_test_hw_arean
# Conflicts:
#	protos/MessageTypeProto.proto
2020-12-12 14:11:59 +08:00
jiahuiwen f5dced2ba9 属性继承自哪个英雄 2020-12-03 17:10:58 +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 a18412872a 跨服服务器通信初版完成 2020-11-19 20:35:16 +08:00
lvxinran 561b12ccd8 秘宝等级修改 2020-10-01 00:28:30 +08:00
lvxinran 8c91ab2f0f 加入总次数 2020-09-04 01:42:58 +08:00
zhangshanxue ae58e819a2 诛仙协议提交 2020-08-20 19:38:00 +08:00
zhangshanxue dd53a67961 充值类型更换 2020-08-14 23:40:40 +08:00
zhangshanxue ed7525920e 类型 2020-08-14 22:39:31 +08:00
zhangshanxue f7194e06f2 幸运探宝次数 2020-07-27 21:32:32 +08:00
zhangshanxue 6c52552e21 幸运探宝次数 2020-07-24 01:22:15 +08:00
lvxinran 23b6b64334 打点访客id 2020-07-13 10:46:13 +08:00
lvxinran dd4bd0f970 英雄图鉴协议修改 2020-06-24 17:24:25 +08:00
lvxinran 7aa2ce1931 英雄公会技能信息添加 2020-06-26 00:26:54 +08:00
lvxinran eda1c5d18b 添加活动id 2020-06-08 22:39:32 +08:00
lvxinran 4bfcb2ed1a 排行榜第一名信息,膜拜信息协议 2020-06-05 11:22:10 +08:00
zhangshanxue 0890629260 Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化) 2020-05-18 21:01:01 +08:00
zhangshanxue 286a502fb2 Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化) 2020-05-16 17:50:59 +08:00
zhangshanxue 548ddeeeec 祭祀 2020-05-06 16:25:38 +08:00
lvxinran 09a6117269 宝器强化精炼协议 2020-04-26 16:46:53 +08:00
lvxinran 0ab1d34640 日常副本协议修改 2020-04-26 15:40:22 +08:00
lvxinran 5fce690941 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-04-26 14:59:46 +08:00
lvxinran ca2c652db2 宝器相关注释 2020-04-26 14:59:41 +08:00
wangyuan c49aaf01ac Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2020-04-26 13:58:56 +08:00
wangyuan 853bfa93f1 获取指定活动信息 2020-04-26 13:58:43 +08:00
lvxinran d431836781 战斗结果协议 2020-04-26 13:41:11 +08:00
lvxinran cb44c2f3cf 日常副本 协议 2020-04-24 14:12:23 +08:00
lvxinran 54adff8768 法宝协议删除,修改 2020-04-01 14:54:58 +08:00
lvxinran 1071da720c Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-04-01 14:17:52 +08:00
lvxinran 037e5b9324 法宝系统修改 2020-04-01 14:17:48 +08:00
zhangshanxue fe09b0eb49 月卡修改 2020-03-30 16:27:17 +08:00
zhangshanxue a4de374ae0 月卡修改 2020-03-30 16:14:04 +08:00
zhangshanxue 2819a37b08 月卡修改 2020-03-30 16:02:14 +08:00
zhangshanxue 6316d19184 月卡修改 2020-03-30 15:50:53 +08:00
zhangshanxue 0ca8a426b3 月卡修改 2020-03-30 14:42:22 +08:00
lvxinran afc5893be2 删除月刷新协议 2020-03-21 15:53:18 +08:00
lvxinran de046f7ba0 戒灵秘宝时间添加 2020-03-21 15:14:05 +08:00
lvxinran ad9f4cd7c1 排行榜活动id 2020-01-03 09:55:44 +08:00
lvxinran 02c8d09c29 特权推送 2019-12-31 11:14:13 +08:00
lvxinran 002099c495 取消协议 2019-12-20 10:48:02 +08:00
lvxinran 0073746e95 物品上限 2019-12-19 18:21:22 +08:00
lvxinran 27a3cb049c Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol
# Conflicts:
#	protos/PlayerInfoProto.proto
2019-12-19 18:12:41 +08:00
lvxinran 719a995fb5 检测物品上限 2019-12-19 18:11:51 +08:00
zhangshanxue 370e9e44a8 TASK【ID1005242】 【选人起名】 协议提交 2019-12-19 13:42:49 +08:00
zhangshanxue cf2eaed3ff TASK【ID1005242】 【选人起名】 协议提交 2019-12-19 11:16:41 +08:00
lvxinran 3086a01ecf 刷新次数 2019-12-16 18:37:04 +08:00
lvxinran d2269b148e 迷宫寻宝刷新任务 2019-12-13 10:31:51 +08:00
lvxinran 0a3a72cfd2 派遣 2019-12-12 17:05:24 +08:00
lvxinran 8cbd8af99c 迷宫寻宝协议 2019-12-12 15:17:01 +08:00
zhangshanxue 9062256d5c Task【ID1005229】【特权调整】协议提交 2019-12-12 11:14:32 +08:00
zhangshanxue f35e16443d Task【ID1005229】【特权调整】协议提交 2019-12-12 11:00:47 +08:00
zhangshanxue 711afb239f Task【ID1005229】【特权调整】协议提交 2019-12-11 16:59:32 +08:00
lvxinran 08dabf6aeb 活动协议 2019-12-14 00:01:22 +08:00
lvxinran cd65719a14 限时抽卡 2019-12-13 08:08:27 +08:00
lvxinran 2fc264ff6c 排行榜请求 2019-11-27 18:08:31 +08:00
lvxinran 0ea8ca16c7 排行榜修改重构 2019-11-27 10:48:14 +08:00
lvxinran d4108e898f 修改外观协议 2019-11-20 17:45:28 +08:00
lvxinran dc57928be7 第一次进入副本协议 2019-10-31 11:40:56 +08:00
wangyuan a8fb06850b 挂机奖励 2019-10-30 10:23:01 +08:00
wangyuan a86b0009d9 外敌 2019-10-21 18:35:56 +08:00
wangyuan e5d161ad29 view hero detail 2019-10-15 16:51:59 +08:00
lvxinran 891767ea89 头像协议修改 2019-10-17 00:02:32 +08:00
lvxinran 223e5e3b64 修改头像协议 2019-10-16 22:05:22 +08:00
wangyuan f66be87583 一键移除 2019-10-11 18:29:30 +08:00
lvxinran ca2179170b 删除邮件 2019-12-14 08:38:07 +08:00
lvxinran 8a2cc3842a 戒灵秘宝等级推送 2019-10-10 11:27:37 +08:00
lvxinran d66afb32d0 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-10-09 20:00:30 +08:00
lvxinran 5f940182dc 戒灵秘宝推送 2019-10-09 20:00:26 +08:00
lvxinran bc428daa75 孙龙宝藏购买等级 2019-10-19 15:49:01 +08:00
lvxinran 4c8400e997 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-10-19 15:36:47 +08:00
lvxinran 3034b031af 孙龙等级 2019-10-19 15:36:39 +08:00
wangyuan 6d628a6c6c fix black 2019-10-09 15:48:49 +08:00
wangyuan ee1b87c8d5 登录给黑名单信息 2019-10-09 15:25:54 +08:00
wangyuan f6fa44e3a9 好友黑名单操作 2019-10-09 15:11:48 +08:00
zhangshanxue 116207f0d3 回复中奖数 2019-09-27 15:24:29 +08:00
zhangshanxue 4175b75d04 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-09-26 11:02:51 +08:00
zhangshanxue b0f999ca6e 幸运探宝 2019-09-26 11:02:46 +08:00
wangyuan 452b5e51b8 work shop level 2019-09-25 17:27:35 +08:00
zhangshanxue bb086b8110 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol
# Conflicts:
#	protos/PlayerInfoProto.proto
2019-09-25 15:55:33 +08:00