Commit Graph

478 Commits (c57563a1a6ed6f67048a150065d700633d4bf16d)

Author SHA1 Message Date
duhui c57563a1a6 连续礼包优化 2021-12-02 15:10:30 +08:00
yuanshuai 56b5c2c3b7 天地洪炉协议提交 2021-11-26 10:30:28 +08:00
yuanshuai 2a4f830218 天地烘炉选择up卡协议 2021-11-25 17:24:15 +08:00
duhui 0c77b925ff Merge branch '开发/dev_dh' into master_test_gn 2021-11-25 18:15:01 +08:00
yuanshuai cb6dd8b9cf Merge branch 'master_test_gn' into master_test_gn_fabao 2021-11-18 17:50:40 +08:00
duhui 423834b81c Merge branch 'master_test_gn' into 开发/dev_dh
# Conflicts:
#	protos/CommonProto.proto
2021-11-17 18:21:39 +08:00
xuexinpeng 0527b1590d 灵脉秘境的indication 2021-11-17 16:45:19 +08:00
duhui 52e7d63256 身外化身功能 2021-11-16 16:08:03 +08:00
yuanshuai 95f4388736 法宝之魂协议提交 2021-11-15 14:04:39 +08:00
xuexinpeng 3a0b37200b 灵脉秘境 2021-11-12 11:23:09 +08:00
yuanshuai e3349a1edf Merge branch 'master_test_gn_godsoul' into master_test_gn 2021-11-03 19:01:19 +08:00
xuexinpeng 674c89e1c0 周卡 2021-10-29 14:20:32 +08:00
yuanshuai 3b91b30cca Merge branch 'master_test_gn' into master_test_gn_godsoul
# Conflicts:
#	protos/CommonProto.proto
2021-10-29 11:36:50 +08:00
xuexinpeng 57ce524e26 周卡协议 2021-10-28 15:05:39 +08:00
yuanshuai d02da5bb58 协议修改 2021-10-21 18:31:04 +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 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 06f612d309 Merge branch 'dh_dev_ridingsward' into master_test_gn 2021-10-20 13:45:07 +08:00
jiahuiwen a43a465a5e 山河社稷图领取每日奖励 2021-10-19 15:20:07 +08:00
jiahuiwen 8947125973 主角修为 2021-10-19 13:45:39 +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
yuanshuai d130618ee5 添加装备图鉴数量修改推送 2021-10-14 14:56:28 +08:00
duhui 2b3dcc650d 御剑行,协议补充 2021-10-12 11:04:10 +08:00
duhui f5aabbbee0 御剑飞行 协议 2021-10-11 09:57:26 +08:00
yuanshuai fd51fcd89c 神魂协议提交 2021-09-30 11:49:55 +08:00
yuanshuai 5943b3b6bc 协议修改提交 2021-09-23 10:06:50 +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
duhui 49b59587c7 鸿蒙阵推送 2021-09-19 01:25:52 +08:00
duhui e9cb856ee5 Merge branch 'master_test_gn' into dh_dev_sevenworld 2021-09-17 14:23:50 +08:00
yuanshuai 695dcd1f7e 四象心法协议 2021-09-14 13:52:25 +08:00
xuexinpeng db218c6280 玉虚论道战力回放 2021-09-13 16:13:42 +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
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
xuexinpeng 5a036b3e50 玉虚论道挑战前面板数据 战斗回放 2021-09-08 14:49:46 +08:00
xuexinpeng 4933ce8251 玉虚论道 2021-09-08 11:09:21 +08:00
xuexinpeng c609dfe1c3 玉虚论道 2021-09-07 19:36:13 +08:00
xuexinpeng 16545af2e9 玉虚论道 2021-09-07 13:56:44 +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
xuexinpeng 3b51b925a7 太初密卷 2021-08-16 16:57:31 +08:00
xuexinpeng 43b3dbe56f 寻宝迷踪 2021-08-10 10:02:58 +08:00
lvxinran 35c1267af8 充值前检测 2021-08-07 16:58:39 +08:00
duhui a2b561512e 跨服状态推送 2021-07-30 14:44:54 +08:00
duhui 0d7d84e07b 协议修改 2021-07-29 14:29:10 +08:00