Commit Graph

4933 Commits (6957ef336fe18121d8aa5b7ce6dff8d34a67d2be)

Author SHA1 Message Date
lvxinran 4b7d67c586 Merge branch 'master_test_gn_zf' into master_test_gn 2021-07-20 09:57:02 +08:00
lvxinran 7e93977007 埋点修改 2021-07-20 09:56:10 +08:00
duhui ad6dfd7de6 超值基金bug修改 2021-07-20 09:55:43 +08:00
lvxinran 6e8dc9fb64 Merge branch 'master_test_gn_zf' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2021-07-19 19:40:38 +08:00
xuexinpeng 65fbb27c1b 快速挑战:拍脸 2021-07-19 18:33:28 +08:00
xuexinpeng 83e9c81b8c 山河试炼快速挑战 拍脸 2021-07-19 18:08:08 +08:00
lvxinran 62fe24b3af Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-07-19 17:15:09 +08:00
lvxinran 1cdc3e658d 被封禁后不再上报 2021-07-19 17:15:03 +08:00
lvxinran a01d8d6037 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-07-31 11:46:41 +08:00
lvxinran 37fc2796ce 十绝阵解散修改 2021-07-31 11:46:32 +08:00
lvxinran 20cf1f52b2 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-07-29 23:16:26 +08:00
lvxinran 917331ec42 第一次刷新修改 2021-07-29 23:16:20 +08:00
xuexinpeng 5eb495a8e4 活动类型:5 2021-07-20 16:34:02 +08:00
duhui fca529e5d9 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-07-19 17:04:07 +08:00
duhui 567f31c33a 超值基金修改 2021-07-19 17:03:56 +08:00
xuexinpeng 1ac7d8e139 活动类型:5 2021-07-19 16:04:59 +08:00
xuexinpeng 70576ce70a 活动类型:5 2021-07-19 15:46:20 +08:00
duhui 414f2c91db 超值基金活动修改 2021-07-19 13:51:50 +08:00
duhui 3415e92270 超值基金bug修改 2021-07-19 10:57:02 +08:00
lvxinran a9802099c0 跨服修改 2021-07-19 06:07:09 +08:00
lvxinran 4b641f5109 跨服修改 2021-07-18 23:57:59 +08:00
lvxinran cbe1b7753e 封禁提示 2021-07-18 01:26:33 +08:00
xuexinpeng cdaeb7c971 新活动类型:5 2021-07-16 18:56:13 +08:00
xuexinpeng f30d36473d 新加活动类型:5 2021-07-16 17:07:17 +08:00
lvxinran d93d9a1f6a 心愿抽卡发邮件替换 2021-07-16 15:25:15 +08:00
duhui 3000c791f2 Merge branch 'dh_dev_wishDrawCard' into master_test_gn
(cherry picked from commit 5c69363203)
2021-07-16 14:26:33 +08:00
duhui f61b9c81f6 超值基金bug修改 2021-07-16 14:16:46 +08:00
DESKTOP-98AVA47\Administrator bc3ec7b772 杜辉提交,心愿抽卡主题活动兼容 2021-07-16 00:51:40 +08:00
mengchengzhen b2b03eb17a 增加丢失代码 2021-07-15 18:11:47 +08:00
mengchengzhen 91080b333b Merge branch 'master_test_gn' into master_test_gn_mcz
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2021-07-15 17:33:45 +08:00
mengchengzhen c87f0e1864 许愿魂印 2021-07-15 17:12:34 +08:00
duhui 5c69363203 Merge branch 'dh_dev_wishDrawCard' into master_test_gn 2021-07-15 16:33:54 +08:00
duhui 8a1b28f04e Merge branch 'dh_dev_qimendunjia' into master_test_gn
奇门遁甲协议合并
2021-07-15 16:33:44 +08:00
duhui 708cc0b718 Merge branch 'dh_dev_fund' into master_test_gn 2021-07-15 16:31:12 +08:00
duhui fd888a7141 奇门遁甲消耗 2021-07-15 16:27:08 +08:00
duhui b2f31798b0 心愿抽卡优化 2021-07-15 16:03:04 +08:00
xuexinpeng 83f9c3fe83 热更奖励id变更 bug 2021-07-15 14:06:42 +08:00
lvxinran 07fe5c89ed Merge branch 'master_test_gn_zf' into master_test_gn 2021-07-15 04:34:40 +08:00
lvxinran ef19e67afe Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-07-15 04:01:17 +08:00
lvxinran bd3c9a6abb 福星高照 2021-07-15 04:01:11 +08:00
lvxinran 941839a2c1 活动礼包刷新 2021-07-15 00:11:47 +08:00
lvxinran 37d02a17c9 福星高照暂时关闭 2021-07-15 00:11:29 +08:00
duhui 4221f30b3a 战报小问题修改 2021-07-14 17:59:24 +08:00
xuexinpeng af37022e38 战令调整 2021-07-14 17:18:09 +08:00
duhui a4ad63b731 超值基金活动改版 2021-07-14 17:11:57 +08:00
lvxinran ca0fd1e10a 物品获得 2021-07-14 02:31:22 +08:00
xuexinpeng 0092fc6886 山河试炼 2021-07-13 10:30:39 +08:00
lvxinran 3c3299acfa 跨服修改 2021-07-12 19:29:31 +08:00
duhui 80b1659cb1 心愿抽卡功能优化 2021-07-12 17:45:07 +08:00
lvxinran aade43b553 分组修改 2021-07-12 11:46:00 +08:00
lvxinran 3d340f2511 时间设置修改 2021-07-12 11:31:21 +08:00
lvxinran 287ef6b01b 修改顺序 2021-07-10 02:03:02 +08:00
lvxinran 58e0f37195 无尽重置获得 2021-07-10 02:00:29 +08:00
lvxinran cf1070855c Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-07-09 16:41:33 +08:00
lvxinran ec22c8f128 无尽副本回血 2021-07-09 16:41:21 +08:00
lvxinran 3400966b7d 容错处理 2021-07-09 16:40:17 +08:00
lvxinran 8cf5eb861f 修改日志位置 2021-07-09 14:30:28 +08:00
duhui e9bf77669d 神将归元, 代码修改. 无影响 2021-07-09 10:19:54 +08:00
duhui d09523bb89 公会技能, 连点升级bug处理 2021-07-08 18:09:14 +08:00
lvxinran b472382f69 修复表问题 2021-07-08 14:00:43 +08:00
lvxinran 5f4c02be98 报空修改 2021-07-07 16:35:15 +08:00
duhui 9ae3b7f7a7 Merge branch 'master_test_gn' into master_prb_gn 2021-07-06 16:44:43 +08:00
duhui 391c7f3cbe 心愿抽卡 旧玩家次数兼容 2021-07-06 16:44:20 +08:00
duhui f99d167acb Merge branch 'master_test_gn' into master_prb_gn 2021-07-06 10:52:30 +08:00
duhui 8e2a23d1ba 英雄技能问题修改 2021-07-06 10:51:54 +08:00
duhui 49d14336aa Merge branch 'master_test_gn' into master_prb_gn 2021-07-06 09:30:47 +08:00
duhui d3425b731f 心愿抽奖概率修改 2021-07-06 09:30:26 +08:00
xuexinpeng 2ba57b1a4a 更新状态不自动改变问题 2021-07-05 19:33:01 +08:00
xuexinpeng 26b004932a 缥缈之旅 2021-07-05 18:49:21 +08:00
duhui 01989a261d Merge branch 'master_test_gn' into master_prb_gn 2021-07-05 18:44:14 +08:00
duhui 1eaeb11f7b Merge branch 'master_test_gn' into master_prb_gn 2021-07-07 00:30:25 +08:00
duhui b5099247d6 心愿抽卡bug处理 2021-07-07 00:25:51 +08:00
xuexinpeng e5384f2e3c 飘渺之旅 2021-07-13 19:08:52 +08:00
xuexinpeng 7f0131278d Merge branch 'master_test_gn' into master_test_gn_xxp 2021-08-02 00:07:28 +08:00
xuexinpeng 5fdbf0d978 飘渺之旅 2021-08-02 00:06:50 +08:00
duhui c5bd6dcb89 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-07-05 18:43:16 +08:00
duhui d9941a380c 心愿抽卡概率修改 2021-07-05 18:43:01 +08:00
xuexinpeng 1fc0e7335f 缥缈之旅 2021-07-05 18:35:49 +08:00
xuexinpeng f390066adb 飘渺之旅大闹天宫次数初始化 2021-07-07 16:27:02 +08:00
xuexinpeng c149f6ad16 山河社稷星数的初始化 2021-07-06 00:40:05 +08:00
lvxinran a160805f3a 入库位置修改 2021-07-05 13:56:41 +08:00
lvxinran f8297ba50e Merge branch 'master_test_gn_zf' into master_prb_gn 2021-07-05 13:49:57 +08:00
duhui c836a395ab 序列号uid修改 2021-07-05 11:50:06 +08:00
lvxinran f0a38deb24 打印日志 2021-07-05 11:44:03 +08:00
lvxinran 1ed8030f32 Revert "推送礼包优化"
This reverts commit 7ed896b78c.
2021-07-05 11:26:24 +08:00
DESKTOP-98AVA47\Administrator cc6c06f0a7 Merge branch 'master_test_gn' into master_prb_gn 2021-07-06 23:59:28 +08:00
lvxinran 9162b2928c 加入注释 2021-07-05 11:09:07 +08:00
lvxinran f22e88f327 尝试修改充值bug 2021-07-05 11:08:54 +08:00
lvxinran d67a15b22c 日志修改 2021-07-03 11:28:34 +08:00
lvxinran 146c649a3c 山河设计图怪物技能修改 2021-07-02 18:06:23 +08:00
lvxinran 8b5ffb581a family有问题的log 2021-07-02 14:15:10 +08:00
lvxinran e9ec657bf7 添加日志寻找问题 2021-07-02 13:58:00 +08:00
lvxinran 9e048deffe 巅峰赛分组修改 2021-07-02 10:33:15 +08:00
lvxinran 5515c1b9a1 森罗排行修改 2021-07-01 15:42:48 +08:00
mengchengzhen 7ed896b78c 推送礼包优化 2021-07-01 14:27:56 +08:00
duhui a0c902347e 心愿抽卡 权重修改 2021-07-01 11:54:58 +08:00
duhui 6bfaa31a8a 心愿抽卡, 逻辑封装 2021-07-01 11:52:39 +08:00
duhui 2569029171 活动时间冲突处理 2021-07-01 11:36:32 +08:00
lvxinran a0502dfecd 强转报错修改 2021-07-01 11:11:33 +08:00
duhui 35723bfbef 心愿, 优化 2021-07-01 11:07:30 +08:00
duhui 58337cc318 心愿抽卡,格子权重修改 2021-07-01 11:02:01 +08:00
duhui afa3958566 心愿抽奖重新提交 2021-07-01 10:46:44 +08:00
duhui 2514e19137 Merge branch 'dh_dev_seven' into master_test_gn 2021-07-01 10:27:21 +08:00
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 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 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 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
mengchengzhen 611dc9cdc8 天眼log 2021-06-24 11:24:03 +08:00
mengchengzhen 966351e03c 跨服 2021-06-23 18:54:37 +08:00