Commit Graph

1569 Commits (master_ob2)
 

Author SHA1 Message Date
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
duhui 1f585e2f31 不用消息体 2021-09-24 00:44:08 +08:00
xuexinpeng 1a7505ceef test_gn合到xxp 2021-09-22 13:47:22 +08:00
jiahuiwen 78b1fc1898 Revert "回滚,当前版本不上"
This reverts commit dc2d3ac2a3.
2021-09-17 17:06:43 +08:00
jiahuiwen 78fd94446e Merge branch 'master_test_gn' into master_prb_gn 2021-09-17 16:49:01 +08:00
duhui dc2d3ac2a3 回滚,当前版本不上 2021-09-27 11:14:51 +08:00
duhui 49b59587c7 鸿蒙阵推送 2021-09-19 01:25:52 +08:00
duhui 0474594964 Merge branch 'master_prb_gn' into master_test_gn 2021-09-27 11:09:36 +08:00
duhui e9cb856ee5 Merge branch 'master_test_gn' into dh_dev_sevenworld 2021-09-17 14:23:50 +08:00
duhui 0b4ced851c 七界挑战 2021-09-16 19:14:01 +08:00
yuanshuai 695dcd1f7e 四象心法协议 2021-09-14 13:52:25 +08:00
yuanshuai 43d0bf08ef Merge branch 'master_test_gn' into master_test_gn_ys
# Conflicts:
#	protos/PlayerInfoProto.proto
2021-09-14 12:00:45 +08:00
duhui 22a5f15772 十绝阵伤害int改long 2021-09-14 10:16:11 +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
xuexinpeng 8ae56119d9 玉虚论道 2021-09-10 15:12:08 +08:00
xuexinpeng 40b50acacb 玉虚论道 2021-09-10 09:52:32 +08:00
yuanshuai b531ccdf4f 【四象心法】协议修改 2021-09-10 09:44:10 +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
xuexinpeng 4933ce8251 玉虚论道 2021-09-08 11:09:21 +08:00
wangzhenxing bd8b3ac8ff 队伍信息添加服务器名称字段 2021-09-07 21:01:08 +08:00
xuexinpeng c609dfe1c3 玉虚论道 2021-09-07 19:36:13 +08:00
xuexinpeng 58165b732c 玉虚论道挑战次数 2021-09-07 15:18:32 +08:00
xuexinpeng a4728e94d6 玉虚论道日常领奖 2021-09-07 15:00:18 +08:00
xuexinpeng 16545af2e9 玉虚论道 2021-09-07 13:56:44 +08:00
duhui c187fb3c49 Merge branch 'dev_dh_fourspirit2' into master_test_gn 2021-09-02 21:02:37 +08:00
xuexinpeng 32e08b5461 玉虚论道 2021-09-02 15:14:59 +08:00
xuexinpeng c1993567fd 玉虚论道 2021-09-02 11:49:22 +08:00
duhui 6701577249 建木 2021-09-01 10:34:22 +08:00
duhui ab0a2bce91 建木神树,快速升级 2021-09-01 10:13:31 +08:00
duhui 51b2228ad7 添加四灵试炼层数 2021-08-31 14:11:06 +08:00
duhui 2807ad2cc3 Merge branch 'master_test_gn' into dev_dh_fourspirit2 2021-09-02 15:21:17 +08:00
duhui 3d96082be3 四灵试炼修改 2021-08-31 11:40:06 +08:00
duhui e0d5058c04 四灵试炼修改 2021-08-31 11:38:36 +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
duhui 4bed9e9eea 推荐公会分页 2021-08-27 14:48:43 +08:00
xuexinpeng 3b51b925a7 太初密卷 2021-08-16 16:57:31 +08:00
xuexinpeng 43b3dbe56f 寻宝迷踪 2021-08-10 10:02:58 +08:00