Commit Graph

1611 Commits (202de0c6ec983f03ce6cedeaf1f96080918a2621)
 

Author SHA1 Message Date
yuanshuai 24fdc5b21f Merge branch 'master_test_gn' into master_test_gn_lifeGrid 2021-12-13 10:45:30 +08:00
duhui b1516efe6b 公会boss伤害超上限 2021-12-10 18:27:37 +08:00
duhui 7f2c87c305 公会boss伤害超上限 2021-12-10 16:44:26 +08:00
yuanshuai f9a5b1f70d 命石合成添加掉落 2021-12-08 16:26:45 +08:00
yuanshuai 3bf9f47ac4 协议修改 2021-12-07 15:53:17 +08:00
yuanshuai e11cdac272 命格协议修改 2021-12-07 14:33:38 +08:00
yuanshuai eee8bcedd5 命格协议修改 2021-12-07 13:18:46 +08:00
yuanshuai 6801b91f83 协议注释修改 2021-12-07 13:08:06 +08:00
yuanshuai f2e3e22856 命格数据初始化协议提交 2021-12-07 10:38:45 +08:00
yuanshuai 206549e7c5 命格协议提交 2021-12-07 09:34:32 +08:00
duhui c444d70ecd 字段修改 2021-12-06 17:35:16 +08:00
duhui ff332c0887 大闹天宫,怪物加神魂等级 2021-12-06 15:29:38 +08:00
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 941aad2610 Merge branch 'master_test_gn_fabao' into master_test_gn 2021-11-19 17:59:19 +08:00
yuanshuai cb6dd8b9cf Merge branch 'master_test_gn' into master_test_gn_fabao 2021-11-18 17:50:40 +08:00
xuexinpeng 29d34532dd 灵脉秘境 2021-11-18 17:45:23 +08:00
xuexinpeng 3670be7393 灵脉秘境 2021-11-18 13:21:22 +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
xuexinpeng c6027b4a34 灵脉 2021-11-16 18:31:08 +08:00
duhui 52e7d63256 身外化身功能 2021-11-16 16:08:03 +08:00
xuexinpeng 4c4c5de25c 灵脉秘境 2021-11-16 14:11:36 +08:00
xuexinpeng 582668d4fa 灵脉秘境 2021-11-16 13:57:12 +08:00
duhui e737288254 礼包添加类型 2021-11-30 15:17:02 +08:00
yuanshuai 95f4388736 法宝之魂协议提交 2021-11-15 14:04:39 +08:00
xuexinpeng 3a0b37200b 灵脉秘境 2021-11-12 11:23:09 +08:00
yuanshuai 2e99b61df7 森罗幻境阵容添加神魂等级字段 2021-11-05 15:11:22 +08:00
yuanshuai e3349a1edf Merge branch 'master_test_gn_godsoul' into master_test_gn 2021-11-03 19:01:19 +08:00
xuexinpeng 76990b8420 周卡 2021-10-29 16:32:00 +08:00
xuexinpeng 674c89e1c0 周卡 2021-10-29 14:20:32 +08:00
yuanshuai 8a2a6ec9ab 战中神魂等级数据提交 2021-10-29 11:37:35 +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
duhui 574e07de13 车迟斗法伤害溢出问题 2021-10-28 16:58:14 +08:00
xuexinpeng 57ce524e26 周卡协议 2021-10-28 15:05:39 +08:00
yuanshuai 4b8c0d895d 主角技能添加性别字段 2021-10-26 17:06:38 +08:00
yuanshuai 04d0c38171 添加神魂等级 2021-10-26 16:00:37 +08:00
yuanshuai af5285bc3c Merge branch 'master_test_gn' into master_test_gn_godsoul 2021-10-26 15:13:49 +08:00
yuanshuai 6601976474 神魂协议修改 2021-10-25 10:27:37 +08:00
xuexinpeng e761da165d 跨服yx战斗记录新加对手分值 2021-10-22 16:25:13 +08:00
yuanshuai fd69df13e9 神魂相关协议提交 2021-10-22 16:12:50 +08:00
yuanshuai 7288e92a2e Merge branch 'master_test_gn' into master_test_gn_godsoul 2021-10-22 13:50:40 +08:00
yuanshuai d02da5bb58 协议修改 2021-10-21 18:31:04 +08:00
xuexinpeng f044946b6e 一键领取到的奖励id 2021-10-21 17:39:07 +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 9f5403b866 神魂漏提交协议 2021-10-13 18:12:39 +08:00
DESKTOP-98AVA47\Administrator a3c17255f4 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_protocol into master_test_gn 2021-10-11 23:24:15 +08:00