Commit Graph

524 Commits (794b58cde53fea15daa152defcd65f82bf39dd26)

Author SHA1 Message Date
yuanshuai fd69df13e9 神魂相关协议提交 2021-10-22 16:12:50 +08:00
yuanshuai fdce1162e1 Merge branch 'master_test_gn' into master_test_gn_godsoul
# Conflicts:
#	protos/CommonProto.proto
#	protos/HeroInfoProto.proto
2021-10-21 16:31:21 +08:00
yuanshuai 8f6912f20e 修行技能战斗相关协议修改 2021-10-21 15:31:11 +08:00
yuanshuai 260fe178c2 Merge branch 'master_test_gn_practiceSkill' into master_test_gn
# Conflicts:
#	protos/CommonProto.proto
#	protos/PlayerInfoProto.proto
2021-10-20 18:41:12 +08:00
duhui 5d3d1b5589 轮次 2021-11-03 23:52:14 +08:00
duhui 06f612d309 Merge branch 'dh_dev_ridingsward' into master_test_gn 2021-10-20 13:45:07 +08:00
yuanshuai 997ba0febc 战斗协议修改,新增修行技能数据 2021-10-20 13:20:44 +08:00
yuanshuai 6660ec9d55 修行技能相关协议提交 2021-10-19 10:00:40 +08:00
duhui cb57cb7491 Merge branch 'master_test_gn' into dh_dev_ridingsward
# Conflicts:
#	protos/CommonProto.proto
2021-10-14 16:19:17 +08:00
xuexinpeng 26afa7210a Merge branch 'master_test_gn' into master_test_gn_xxp 2021-10-13 20:02:00 +08:00
yuanshuai 037e1cb052 装备图鉴协议提交 2021-10-13 18:12:03 +08:00
duhui 28baad3c5f 小修改 2021-10-12 11:01:30 +08:00
duhui 3b048b39f6 御剑行,协议修改 2021-10-12 11:00:40 +08:00
duhui 58a36ebdd1 参数修改 2021-10-11 15:32:23 +08:00
duhui 09b4b3323f 协议报错修改 2021-10-11 11:05:06 +08:00
duhui f5aabbbee0 御剑飞行 协议 2021-10-11 09:57:26 +08:00
xuexinpeng 26fc056a1d 战斗回放加战力显示 2021-10-09 20:25:31 +08:00
yuanshuai fd51fcd89c 神魂协议提交 2021-09-30 11:49:55 +08:00
yuanshuai 5be06d0c1a 好感度协议提交 2021-09-22 17:10:37 +08:00
yuanshuai fcbd24e755 Merge branch 'master_test_gn_ys' into master_test_gn
# Conflicts:
#	protos/CommonProto.proto
2021-09-22 15:16:50 +08:00
duhui c576985f49 Merge branch 'dh_dev_sevenworld' into master_test_gn
# Conflicts:
#	protos/PlayerInfoProto.proto
2021-09-22 13:56:56 +08:00
xuexinpeng 1a7505ceef test_gn合到xxp 2021-09-22 13:47:22 +08:00
yuanshuai 695dcd1f7e 四象心法协议 2021-09-14 13:52:25 +08:00
xuexinpeng db218c6280 玉虚论道战力回放 2021-09-13 16:13:42 +08:00
wangzhenxing 80adf62bb6 协议字段修改 2021-09-11 14:58:19 +08:00
wangzhenxing e62c871d7a 协议添加字段 2021-09-11 00:47:47 +08:00
yuanshuai 991a16eebd Revert "Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_protocol into master_test_gn"
This reverts commit a6721e2f5c, reversing
changes made to c187fb3c49.
2021-09-09 20:37:46 +08:00
xuexinpeng 30ad5603dc 战斗结构 2021-09-09 20:26:19 +08:00
wangzhenxing 1aa1740b1d 协议提交 2021-09-09 20:13:54 +08:00
wangzhenxing 2b82e9ba00 协议提交 2021-09-09 20:09:41 +08:00
duhui ca524ec493 七界试炼 2021-09-09 17:15:44 +08:00
yuanshuai a6721e2f5c Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_protocol into master_test_gn
# Conflicts:
#	protos/CommonProto.proto
#	protos/PlayerInfoProto.proto
2021-09-09 16:57:21 +08:00
yuanshuai d4e96a43d3 四象心法协议提交 2021-09-09 16:54:29 +08:00
wangzhenxing 458ea0fe80 回放记录添加字段 2021-09-09 16:49:36 +08:00
wangzhenxing 0050185812 协议提交 2021-09-09 16:01:56 +08:00
xuexinpeng f3bfe04eef 玉虚论道战斗回放 2021-09-09 15:53:33 +08:00
xuexinpeng 5a036b3e50 玉虚论道挑战前面板数据 战斗回放 2021-09-08 14:49:46 +08:00
wangzhenxing bd8b3ac8ff 队伍信息添加服务器名称字段 2021-09-07 21:01:08 +08:00
xuexinpeng c609dfe1c3 玉虚论道 2021-09-07 19:36:13 +08:00
duhui c187fb3c49 Merge branch 'dev_dh_fourspirit2' into master_test_gn 2021-09-02 21:02:37 +08:00
xuexinpeng c1993567fd 玉虚论道 2021-09-02 11:49:22 +08:00
duhui 51b2228ad7 添加四灵试炼层数 2021-08-31 14:11:06 +08:00
duhui 59dd029a1b Merge branch 'master_test_hw_four_challenge' into dev_dh_fourspirit2
# Conflicts:
#	protos/CommonProto.proto
#	protos/MessageTypeProto.proto
#	protos/PlayerInfoProto.proto
四灵试炼合并
2021-08-31 11:38:12 +08:00
xuexinpeng 3b51b925a7 太初密卷 2021-08-16 16:57:31 +08:00
xuexinpeng ef4222a0fe 巅峰赛 开服时间限制 2021-08-06 00:14:55 +08:00
mengchengzhen a9278353d7 //许愿魂印 2021-07-13 17:05:09 +08:00
duhui 359fb8871a Merge branch 'dh_dev_draw' into master_test_gn 2021-06-30 15:07:31 +08:00
duhui 53ed787c69 类型抽卡次数 2021-06-30 10:22:38 +08:00
duhui 668bb6af12 心愿抽卡 2021-06-29 11:08:11 +08:00
xuexinpeng 7fc675bb42 站内信 2021-06-24 16:25:17 +08:00
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