Commit Graph

474 Commits (57ce524e262fdb8f233062f2df6645e22effbe5a)

Author SHA1 Message Date
xuexinpeng 57ce524e26 周卡协议 2021-10-28 15:05:39 +08:00
yuanshuai 4b8c0d895d 主角技能添加性别字段 2021-10-26 17:06:38 +08:00
xuexinpeng e761da165d 跨服yx战斗记录新加对手分值 2021-10-22 16:25:13 +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 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