Commit Graph

524 Commits (794b58cde53fea15daa152defcd65f82bf39dd26)

Author SHA1 Message Date
duhui c9195e2cd9 Merge branch 'dh_dev_draw' into master_test_gn 2021-05-28 10:11:27 +08:00
lvxinran a84116efb9 Merge branch 'master_test_gn' into master_test_gn_endless 2021-07-03 01:21:32 +08:00
duhui 286f195e60 修行,名字颜色 2021-05-27 16:04:48 +08:00
xuexinpeng 4ff9e9f064 战斗回放修行等级 2021-05-26 16:11:45 +08:00
mengchengzhen 04a8f95924 红包+修行等级 2021-05-26 14:29:00 +08:00
duhui 0ff7881a1d 心愿抽奖, 更新新字段名称,更容易辨认 2021-05-25 15:49:27 +08:00
duhui 0d48157660 心愿抽卡更新 2021-05-25 15:37:02 +08:00
lvxinran 6eca63ddbc Merge branch 'master_test_gn' into master_test_gn_endless 2021-05-25 11:57:22 +08:00
duhui a497fb87fb 选择抽卡 2021-05-24 17:19:12 +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
xuexinpeng 9347a3572c Merge branch 'dh_dev_practice' into master_test_gn_hardstage 2021-05-24 11:05:26 +08:00
lvxinran d96dec8506 无尽秘宝 2021-05-20 18:34:30 +08:00
xuexinpeng c200c25b36 vip等级奖励 2021-05-19 18:36:34 +08:00
xuexinpeng bbf1974bce 山河社稷图关卡是否通过 2021-05-18 16:42:31 +08:00
mengchengzhen 6ee55ef495 福利红包 2021-05-18 14:21:19 +08:00
duhui 6409f76fe8 队伍展示紫府神印 2021-05-18 13:53:26 +08:00
duhui e00ec6b8c3 队伍展示神印 2021-05-18 11:47:26 +08:00
lvxinran e52abb9c4e 经验修改 2021-05-17 21:07:30 +08:00
xuexinpeng 42522d48e1 Merge branch 'dh_dev_practice' into master_test_gn_hardstage 2021-05-17 18:35:46 +08:00
duhui 8dae7214f7 修行名字颜色3.0 2021-05-17 16:58:24 +08:00
duhui b58324980e 修行名字颜色1.0 2021-05-17 11:35:20 +08:00
xuexinpeng d31120889d 合并 2021-05-17 11:09:08 +08:00
duhui 7b9129981e 英雄信息添加神印列表 2021-05-14 17:20:28 +08:00
xuexinpeng 8fc7bd90c0 山河社稷 2021-05-13 17:33:52 +08:00
xuexinpeng 1742ea9a63 踏碎凌霄协议 2021-05-12 19:27:33 +08:00
duhui b33c4d70b8 修行玩法 2021-05-12 18:03:07 +08:00
mengchengzhen 748ef9ec28 山河社稷图录像玩家战力 2021-05-11 20:00:50 +08:00
mengchengzhen 96455d235e 山河社稷图 2021-05-11 15:00:47 +08:00
mengchengzhen 174701995f 山河社稷图 2021-05-11 13:36:15 +08:00
mengchengzhen 1e1021859b 山河社稷图 2021-05-10 11:26:55 +08:00
mengchengzhen e7a6efe95c 山河社稷图 2021-05-10 10:33:54 +08:00
mengchengzhen c94fe904bf 山河社稷图 2021-05-10 10:08:10 +08:00
mengchengzhen 7c330aaacb 聊天队伍称号添加 2021-04-12 10:22:00 +08:00
mengchengzhen c79335fc96 坐骑加性别 2021-03-29 14:55:24 +08:00
mengchengzhen b5836049e9 称号,皮肤,坐骑 2021-03-29 12:00:56 +08:00
duhui 3b9cdfb75f 四灵试炼,神树共鸣 2021-03-15 16:10:29 +08:00
lvxinran 437f548ae8 物品数量协议修改 2021-03-10 17:28:43 +08:00
lvxinran 73cdb84bd9 国内数量修改 2021-02-28 13:27:15 +08:00
whb 4e44a45caf datetype 2021-02-23 16:03:05 +08:00
duhui 372782bdc7 四灵助战,英雄的魂宝灵宝 2021-02-07 11:55:33 +08:00
duhui 2d0a316d3b 四灵试炼推送协议 2021-02-05 16:52:06 +08:00
duhui ebed66d682 四灵协议修改 2021-02-04 16:35:23 +08:00
duhui 1b5235ea6a 四灵,获取战斗记录 2021-02-03 16:35:23 +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
duhui e1bd3f7daf 头像框到期推送,和获取玩家信息添加 2021-01-15 15:07:00 +08:00
duhui e7c935eef9 道具添加到期时间 2021-01-15 14:04:41 +08:00
jiaoyangna db42a5f6d9 四灵协议添加 2021-01-12 17:48:49 +08:00
duhui 6055543e05 天宫探险加锁 2020-12-30 16:18:02 +08:00
zhangshanxue 1ff6327aa2 性别信息 2021-02-20 17:21:59 +08:00
duhui 8bc2e1421c 神树 2020-12-18 16:14:11 +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
lvxinran b97e312785 四灵试炼协议 2020-12-16 11:26:23 +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 13e2cb8f21 跨服服务器 2020-12-02 10:26:24 +08:00
zhangshanxue a18412872a 跨服服务器通信初版完成 2020-11-19 20:35:16 +08:00
lvxinran a9bcef1d37 Merge branch 'master_test_hw' into master_test_skin 2020-11-06 10:19:45 +08:00
lvxinran fbf5bad0ee 战斗内皮肤协议 2020-11-13 05:52:17 +08:00
lvxinran 64c34e4bd1 皮肤展示 2020-12-07 15:06:52 +08:00
zhangshanxue a2e0a37bf3 猎妖之路队伍站位 2020-11-05 15:21:27 +08:00
lvxinran 025662706d 皮肤协议提交 2020-10-28 19:54:45 +08:00
lvxinran aeabaa9b34 首通奖励 2020-10-27 17:52:16 +08:00
lvxinran 1ff2f9e6ab Merge branch 'master_test_hw' into master_test_hw_special_monster 2020-10-27 13:58:25 +08:00
lvxinran 3aba0f133e 查看信息协议修改 2020-10-26 11:00:42 +08:00
lvxinran 0f8e9aca39 战斗协议修改 2020-10-24 19:06:42 +08:00
lvxinran 4da39090bb 灵兽技能修改 2020-10-23 17:53:45 +08:00
lvxinran b8b24da2b8 协议修改 2020-10-22 10:15:25 +08:00
jiahuiwen 7953508f8a 替换异妖编队 2020-10-20 17:26:28 +08:00
lvxinran 0e1241b8b8 逍遥游红点 2020-10-19 20:13:46 +08:00
lvxinran f90745123d 灵兽协议 2020-10-19 16:01:07 +08:00
lvxinran 3d9bbe425f 格子协议修改 2020-10-16 10:07:43 +08:00
lvxinran 0d56d8a7cf 逍遥游 购买,战斗,协议提交 2020-10-15 12:15:47 +08:00
lvxinran 1e4ff76b46 逍遥游战斗协议 2020-10-15 10:31:21 +08:00
lvxinran f189b68730 逍遥游boss 转盘协议 2020-10-14 21:13:15 +08:00
lvxinran 8131b8c6ba 格子索引添加 2020-10-13 18:36:32 +08:00
lvxinran f020848946 逍遥游协议 2020-10-31 10:58:30 +08:00
zhangshanxue dd53a67961 充值类型更换 2020-08-14 23:40:40 +08:00
lvxinran 76ed52a5d0 Merge branch 'master' into equip_develop
# Conflicts:
#	protos/HeroInfoProto.proto
2020-08-16 14:23:08 +08:00
lvxinran 7fb732d262 通关id修改 2020-08-13 10:00:44 +08:00
zhangshanxue 10af265bfb 英雄置换 2020-08-10 10:48:51 +08:00
lvxinran 09e57f804a 轩辕宝镜协议 2020-08-07 16:45:01 +08:00
lvxinran 4c499ce319 排行榜类型修改 2020-07-31 16:19:53 +08:00
zhangshanxue f4c96fad9d 先手 2020-07-25 21:35:01 +08:00
lvxinran f60867732c Hero协议修改 2020-07-05 08:07:56 +08:00
zhangshanxue 2452696009 TASK 【ID1006484】竞技场进度奖励 2020-07-06 21:12:49 +08:00
lvxinran dd4bd0f970 英雄图鉴协议修改 2020-06-24 17:24:25 +08:00
lvxinran 3c0310b7c7 排行性别添加 2020-06-05 15:28:23 +08:00
zhangshanxue bc9b7a921d 战斗单元新增英雄星级 2020-06-01 15:48:22 +08:00
zhangshanxue 302b617582 Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化) 2020-05-21 10:40:55 +08:00
wangyuan 72403bbe30 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2020-05-19 13:37:27 +08:00
wangyuan f701ac3a7e 战斗添加额外参数(猎妖之路被动) 2020-05-19 13:37:15 +08:00
zhangshanxue af76611c2f Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化) 2020-05-19 12:02:04 +08:00
zhangshanxue ed1ba6bb23 Task【新战斗版本】公会援助 协议提交 2020-05-13 15:28:48 +08:00
zhangshanxue 028bbc281c Task【新战斗版本】公会援助 协议提交 2020-05-13 11:20:37 +08:00
zhangshanxue 6d9e76bf0f Task【新战斗版本】公会援助 协议提交 2020-05-12 10:20:03 +08:00
wangyuan 22116b4247 add uid 2020-05-08 15:30:31 +08:00
wangyuan 5e70446bd2 car record 2020-05-08 15:16:03 +08:00
zhangshanxue 5bb1ca6b9e 祭祀 2020-05-07 17:14:16 +08:00
wangyuan f9147f5006 hero position 2020-05-01 10:15:39 +08:00
lvxinran 3eb8dbf292 英雄身上宝器协议 2020-04-26 11:33:08 +08:00
lvxinran cb44c2f3cf 日常副本 协议 2020-04-24 14:12:23 +08:00
wangyuan eed27144f8 fight position 2020-04-16 14:11:44 +08:00
wangyuan 3435d2f7b7 soul 2020-04-07 17:09:10 +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 203e661dae 月卡修改 2020-03-30 18:20:46 +08:00
zhangshanxue 6316d19184 月卡修改 2020-03-30 15:50:53 +08:00
zhangshanxue 0ca8a426b3 月卡修改 2020-03-30 14:42:22 +08:00
lvxinran de046f7ba0 戒灵秘宝时间添加 2020-03-21 15:14:05 +08:00
zhangshanxue bafc97f901 Task【ID1005460】【玩法需求】猎妖之路 协议提交 2020-02-09 19:49:51 +08:00
zhangshanxue fd6e5257e8 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-01-14 15:48:29 +08:00
zhangshanxue be12edceb2 TASK【ID1005460】【玩法需求】猎妖之路 2020-01-14 15:48:22 +08:00
lvxinran a9b6874d90 工会红包加入公会职位字段 2020-01-10 15:37:46 +08:00
lvxinran e0cdfbaea8 红包发送时间 2020-01-10 14:17:39 +08:00
zhangshanxue 9862c48d3c TASK【ID1005460】【玩法需求】猎妖之路 2020-01-09 18:33:27 +08:00
zhangshanxue 1ff66688f3 TASK【ID1005460】【玩法需求】猎妖之路 2020-01-09 15:00:48 +08:00
zhangshanxue 3ee5814078 TASK【ID1005460】【玩法需求】猎妖之路 2020-01-08 17:24:58 +08:00
zhangshanxue a5f3b18316 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-01-08 16:19:28 +08:00
zhangshanxue 7374daa280 TASK【ID1005460】【玩法需求】猎妖之路 2020-01-08 16:19:22 +08:00
lvxinran 6710e5553e 红包物品Id 2020-01-08 16:19:00 +08:00
lvxinran 8516196ccb 红包id修改 2020-01-08 11:13:17 +08:00
lvxinran d5a71a5b3d 公会红包协议 2020-01-07 15:56:52 +08:00
lvxinran 8e5e26a4fc 排行榜公会图腾 2019-12-27 11:43:41 +08:00
lvxinran 163ef4fef8 vip协议 2019-12-26 15:55:49 +08:00
wangyuan db98e1a1de Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-12-24 16:35:23 +08:00
wangyuan 9a7c5c8524 双方信息 2019-12-24 16:35:20 +08:00
zhangshanxue 1db2718e92 【ID1005331】【星级成长礼】 2019-12-24 15:45:04 +08:00
wangyuan 146a7019f3 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-12-20 13:55:20 +08:00
wangyuan 6c13822f6e 是否是当前竞猜信息 2019-12-20 13:55:13 +08:00
zhangshanxue cf2eaed3ff TASK【ID1005242】 【选人起名】 协议提交 2019-12-19 11:16:41 +08:00
wangyuan 628899c397 fix 2019-12-18 15:52:12 +08:00
wangyuan 9d89c4f395 position 2019-12-18 15:50:27 +08:00
wangyuan 8992abe254 删除无效协议 2019-12-17 17:59:25 +08:00
lvxinran da3b00028f 排行榜协议 2019-12-17 10:50:47 +08:00
wangyuan 941f5511a1 add comment 2019-12-16 16:46:28 +08:00
wangyuan f2a19b406c add id 2019-12-16 16:45:21 +08:00
wangyuan 9c9e11995b teamid 2019-12-16 14:08:16 +08:00
wangyuan e0e31cc753 观看决赛信息 2019-12-13 20:37:41 +08:00
wangyuan f79c872bc7 battle detail 2019-12-13 19:41:52 +08:00
lvxinran 8cbd8af99c 迷宫寻宝协议 2019-12-12 15:17:01 +08:00
zhangshanxue 3f5af63f28 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-12-12 11:00:54 +08:00
zhangshanxue f35e16443d Task【ID1005229】【特权调整】协议提交 2019-12-12 11:00:47 +08:00