Commit Graph

1197 Commits (6eca63ddbca969100b315304e3f6229625271441)
 

Author SHA1 Message Date
lvxinran 6eca63ddbc Merge branch 'master_test_gn' into master_test_gn_endless 2021-05-25 11:57:22 +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
mengchengzhen 0e70baf5b2 福利红包 2021-05-20 14:35:08 +08:00
mengchengzhen e6d260f004 福利红包 2021-05-20 11:29:40 +08:00
mengchengzhen 873647b9be 福利红包 2021-05-20 11:15:27 +08:00
xuexinpeng 1c5a8f74cb 特权等级奖励 2021-05-20 10:09:17 +08:00
xuexinpeng 833fa7d1ad 等级奖励 2021-05-19 19:03:20 +08:00
xuexinpeng c200c25b36 vip等级奖励 2021-05-19 18:36:34 +08:00
lvxinran 090998764d 无尽副本地图id 2021-05-18 16:58:32 +08:00
xuexinpeng bbf1974bce 山河社稷图关卡是否通过 2021-05-18 16:42:31 +08:00
lvxinran 79c738c5a3 无尽士气等级 2021-05-18 15:32:01 +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 16fc3896dc 修行名字颜色2.0 2021-05-17 16:08:33 +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
duhui cf1e0e2c85 修行突破神印推送 2021-05-14 16:46:14 +08:00
xuexinpeng 94508b47cf 山河社稷 2021-05-13 21:42:54 +08:00
xuexinpeng 4d3fc14eea 山河社稷 2021-05-13 21:03:30 +08:00
xuexinpeng 8fc7bd90c0 山河社稷 2021-05-13 17:33:52 +08:00
duhui b7c9bd9c72 神印返回修改 2021-05-13 10:32:00 +08:00
xuexinpeng 1742ea9a63 踏碎凌霄协议 2021-05-12 19:27:33 +08:00
duhui 316510a5ae 修行升级添加返回 2021-05-12 18:35:27 +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
lvxinran 6ba733425e 无尽副本获得新英雄推送 2021-05-08 18:17:09 +08:00
lvxinran 4d0dd49782 获取无尽编队 2021-05-14 16:06:32 +08:00
xuexinpeng 8b934e6557 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_protocol into master_test_gn 2021-04-26 18:32:35 +08:00
mengchengzhen d0277fe533 新礼包推送 2021-04-26 10:45:36 +08:00
xuexinpeng b275c6a0b8 踏碎凌霄增加伤害值 2021-04-23 18:30:24 +08:00
xuexinpeng 8e6402710e 踏碎凌霄协议 2021-04-23 17:52:32 +08:00
duhui e56e463dba Merge branch 'dh_dev_cn_oblation' into master_test_gn 2021-04-20 14:44:31 +08:00
mengchengzhen 6deaeac11f 装备升星(云游商人) 2021-04-16 17:16:59 +08:00
duhui ad89379768 通用祭品修改 2021-04-15 17:49:17 +08:00
duhui 7d841ba487 通用祭品 2021-04-15 17:34:32 +08:00
lvxinran 3138e6de79 Merge branch 'master_test' into master_test_gn 2021-04-15 10:05:44 +08:00
lvxinran 89dc10efc7 协议修改 2021-04-15 10:04:48 +08:00
lvxinran 98f6e88e02 森罗幻境保存位置 2021-04-15 10:02:06 +08:00