Commit Graph

5519 Commits (c7e2243818837a1255435b79fc06d664df5eca75)
 

Author SHA1 Message Date
lvxinran d69b4f6962 查看跨服英雄信息 2021-07-01 10:06:34 +08:00
xuexinpeng 2991256a9c 首冲3天 -> 7天 容错 2021-06-30 19:10:17 +08:00
duhui 3a57065e42 超惠神装 2021-06-30 17:52:50 +08:00
lvxinran 2682d7fa7d 服务器名字修改 2021-06-30 17:32:28 +08:00
lvxinran dcad481e53 查看英雄信息修改 2021-06-30 17:20:55 +08:00
lvxinran 2fe4049b55 跨服分布式锁添加 2021-07-02 18:21:40 +08:00
lvxinran 9c3e803af5 查看信息修改 2021-07-10 03:06:40 +08:00
lvxinran e077ac6173 rank默认排名修改 2021-07-10 02:09:36 +08:00
lvxinran f43e032398 分组信息直接取redis 2021-07-10 01:58:06 +08:00
lvxinran 51ffb72fe6 世界等级计算 2021-07-10 01:27:03 +08:00
lvxinran 1482e79903 起服计算世界等级报空修改 2021-07-10 01:19:58 +08:00
lvxinran f6ec9c2f4b 无用代码删除 2021-07-10 01:01:01 +08:00
lvxinran d265432e5a 无用代码注释 2021-07-10 01:00:06 +08:00
lvxinran 99de70fb11 休战期处理 2021-07-10 00:44:15 +08:00
lvxinran 9eb6920fe7 缓存删除修改 2021-07-10 00:27:46 +08:00
lvxinran 24cc1fbbf1 跨服修改 2021-07-05 01:27:01 +08:00
xuexinpeng 28b5ea5250 Revert "首冲3天 -> 7天 容错"
This reverts commit 482336919c.
2021-06-30 16:50:10 +08:00
xuexinpeng 482336919c 首冲3天 -> 7天 容错 2021-06-30 16:45:57 +08:00
duhui b9a1a2dee4 Merge branch 'dh_dev_wishDrawCard' into master_test_gn 2021-06-30 14:44:51 +08:00
duhui dc2c2ccd99 心愿bug处理 2021-06-30 14:22:43 +08:00
duhui fb6166b202 Merge branch 'master_test_gn_zf' of http://60.1.1.230/backend/jieling_server into master_test_gn_zf 2021-06-30 13:39:19 +08:00
duhui 2b2ce7ea7f 线上日志热更 2021-06-30 13:39:07 +08:00
duhui 3f1ff48f3a 心愿抽卡完善 2021-06-30 11:40:37 +08:00
xuexinpeng c48bf9a268 Merge branch 'master_test_gn' into master_test_gn_xxp
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hardStage/HardStageLogic.java
2021-06-30 10:41:46 +08:00
lvxinran d72acbcea7 奖池修改 2021-07-02 20:19:33 +08:00
lvxinran 610087bc1d 注释修改 2021-07-02 18:27:01 +08:00
lvxinran d70deeeed3 同系卡提交 2021-07-02 18:25:31 +08:00
lvxinran 90f8cba220 抽卡获取同阵营修改 2021-07-02 18:22:35 +08:00
xuexinpeng abc3321c6b 山河试炼注释 暂时不上 2021-06-30 10:31:55 +08:00
duhui a18cdcf1e5 心愿抽卡功能提交 2021-06-30 09:47:49 +08:00
xuexinpeng d6cf251701 山河社稷埋点 2021-06-29 14:16:23 +08:00
xuexinpeng 937cc3d235 山河埋点数据 2021-06-29 11:36:25 +08:00
duhui 29df3cbddd 奇门遁甲2.0 2021-06-29 11:27:28 +08:00
duhui 3afb198cf9 奇门遁甲 协议优化 2021-06-28 16:24:05 +08:00
duhui 24c3c32bb6 Merge branch 'master_test_gn_zf' into master_test_gn 2021-06-28 11:50:43 +08:00
duhui b7d90178ee 战报功能优化 2021-06-28 11:50:12 +08:00
xuexinpeng 5df1ef37d6 站内信 2021-06-28 11:32:17 +08:00
duhui 7cdd1afd84 Merge branch 'master_test_gn_zf' into master_test_gn 2021-06-28 11:09:56 +08:00
duhui abec4c1411 Merge branch 'master_test_gn_zf' into master_test_gn 2021-06-28 11:02:11 +08:00
duhui b3a35321d6 活动非空验证 2021-06-28 10:46:27 +08:00
duhui d9e4e29bb6 惊喜礼盒,bug处理 2021-06-27 22:59:52 +08:00
lvxinran e0568b2717 巅峰赛竞猜币换成邮件转换 2021-06-26 14:04:01 +08:00
lvxinran bbaf6a1556 排名修改 2021-06-26 13:54:03 +08:00
lvxinran 8b8d24f551 跨服名次修改 2021-07-04 01:00:59 +08:00
lvxinran 87111d6365 Merge branch 'master_test_gn_arena' of http://60.1.1.230/backend/jieling_server into master_test_gn_arena 2021-07-03 22:00:17 +08:00
lvxinran 356f652cd1 暂时修改 2021-07-03 22:00:07 +08:00
lvxinran 39bc93bbca 跨服提交 2021-07-03 21:36:27 +08:00
duhui 084758fd99 灵兽对象修改,添加位置信息 2021-06-25 15:42:25 +08:00
duhui 29b68a8996 英雄属性添加 2021-06-25 15:29:26 +08:00
mengchengzhen 0711bfd752 天眼log 2021-06-24 11:49:52 +08:00