Commit Graph

5674 Commits (b791353eb98970185ce76f4606938db55148cc88)

Author SHA1 Message Date
xuexinpeng 38c39eeea4 山河社稷图redis改为mongo存储 2021-11-05 19:19:16 +08:00
DESKTOP-98AVA47\Administrator 02e09225e9 排行榜bug修改 2021-11-15 00:21:21 +08:00
jiahuiwen dcd9f119d7 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-11-05 18:31:26 +08:00
jiahuiwen c1e72e259b 竞技场 超7天未登录玩家不发奖励 2021-11-05 18:31:17 +08:00
yuanshuai 7dbea21500 跨服排行英雄数据添加神魂等级数据 2021-11-05 18:27:08 +08:00
duhui 7b8e4db67b 跨服数据容错,发现一个小问题,如果跨服排行榜有服务器未开启,那么对应服务器的玩家在排行榜上战斗力会显示0 2021-11-05 17:51:22 +08:00
duhui e807b5b743 排行榜批量修改,跨服逻辑统一接口,本地获取排行玩家数据不放缓存 2021-11-05 17:20:36 +08:00
duhui 93a653423f 无用代码删除 2021-11-05 17:10:56 +08:00
yuanshuai bbe20d2156 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-11-05 17:00:22 +08:00
yuanshuai 20293ed53c 山河社稷图添加神魂等级数据 2021-11-05 17:00:07 +08:00
xuexinpeng ad50ec11cb 玉虚积分修正 2021-11-05 16:39:48 +08:00
duhui 33f33f9550 优化 2021-11-05 16:18:45 +08:00
xuexinpeng 108c2d98ea 玉虚修正2 2021-11-05 16:16:59 +08:00
yuanshuai 438b0e85db 大闹天宫添加神魂等级信息 2021-11-05 16:10:02 +08:00
yuanshuai 3b96e6549c Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-11-05 15:52:42 +08:00
yuanshuai eeff859f95 竞技场神魂等级数据添加 2021-11-05 15:52:32 +08:00
xuexinpeng 89e0335f5b 森罗排行排除神秘关卡 2021-11-05 15:51:13 +08:00
yuanshuai 241b8facb5 报错修改 2021-11-05 15:35:03 +08:00
yuanshuai f756444b5a 森罗幻境添加神魂等级信息 2021-11-05 15:15:54 +08:00
xuexinpeng ad571664eb 【优化调整】森罗达人 2021-11-14 00:14:35 +08:00
jiahuiwen aa938f7edb 优化世界等级起服计算 2021-11-05 14:08:28 +08:00
xuexinpeng d3c4ea921b 【山河社稷图】最低战力通关和首次通关的战斗数据由redis改为数据库储存 2021-11-05 10:18:52 +08:00
xuexinpeng c92e5b1b7a 【玉虚优化】优化分数丢失规则: +新增表格内修正分数 2021-11-04 18:10:21 +08:00
xuexinpeng e8ac427ae3 森罗达人排行榜 机制修改 2021-11-04 17:50:43 +08:00
xuexinpeng 3e3fb783ee 周卡表结构变化 2021-11-11 16:45:48 +08:00
duhui 8ac3c8adb0 无尽副本日志 2021-11-04 16:17:45 +08:00
duhui 2aba5b20cc 无用代码注释 2021-11-04 16:14:20 +08:00
xuexinpeng 3f38bf784a 周卡表数据为空后不返回 2021-11-22 00:45:22 +08:00
jiahuiwen 2392506183 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-11-04 14:25:53 +08:00
xuexinpeng 4721fd9342 周卡发邮件 2021-11-22 00:01:55 +08:00
jiahuiwen 11470e73b3 mongo映射java bean 需要默认构造函数 2021-11-04 14:25:42 +08:00
yuanshuai dfc37aef28 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-11-04 14:02:06 +08:00
yuanshuai 2ef8596a6f 注释修改 2021-11-04 14:01:48 +08:00
xuexinpeng 8ef68e0a98 周卡修改 2021-11-08 00:04:52 +08:00
xuexinpeng 58e6af7f72 SGlobalSystemConfig中ifopen开关不好使 2021-11-04 13:47:06 +08:00
jiahuiwen aef4398c40 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-11-04 13:46:04 +08:00
jiahuiwen f13360abd3 优化内存中玩家清除逻辑 2021-11-04 13:45:57 +08:00
yuanshuai f7041150b6 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-11-04 10:59:22 +08:00
yuanshuai 2f675017fa 英雄图鉴bug修改 2021-11-04 10:59:12 +08:00
duhui 8f35b31222 跨服排行榜修改 2021-11-04 10:47:51 +08:00
duhui 5c70df47db 跨服分组修改 2021-11-04 10:11:42 +08:00
xuexinpeng fb69e8de2e 周卡打开 2021-11-08 00:06:49 +08:00
yuanshuai 9e22fed4ad Merge branch 'master_test_gn_godsoul' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
2021-11-03 19:03:22 +08:00
jiahuiwen a4e418364d Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-11-03 17:48:08 +08:00
jiahuiwen bff21f989c 支持商店下架商品 2021-11-03 17:46:27 +08:00
duhui ed62e827fe Merge branch 'dh_dev_crossrank' into master_test_gn 2021-11-03 17:35:26 +08:00
duhui 34333c9a33 跨服数据更到最新 2021-11-03 17:35:01 +08:00
DESKTOP-98AVA47\Administrator 0458b323bf 车迟斗法个人排行积分 2021-11-10 11:00:11 +08:00
xuexinpeng d3ffae3f7e yx挑战限制 2021-11-07 23:34:20 +08:00
xuexinpeng 190e3fcf79 玉虚换一批11.30过后不让刷新 2021-11-07 23:33:08 +08:00
duhui 692e3858c8 礼包bug修改 2021-11-03 16:33:48 +08:00
jiahuiwen b24f82df04 redis key 优化 2021-11-03 14:51:44 +08:00
xuexinpeng 772420df81 删除yx换一批log 2021-11-08 01:47:15 +08:00
xuexinpeng 77b5e4b3d2 yx线上log查问题 2021-11-08 01:13:45 +08:00
xuexinpeng d4c461a5e1 战斗数据新加职业类型 2021-11-02 20:02:30 +08:00
duhui bcfe4d5dac 竞技场每日发奖 2021-11-02 11:14:19 +08:00
yuanshuai 20a26c4f7c Merge branch 'master_prb_gn' into master_test_gn 2021-11-02 11:02:47 +08:00
yuanshuai bbe44fe3c6 修行主角技能相关代码还原 2021-11-02 11:01:59 +08:00
duhui fbdf3ebdad 车迟挑战 2021-11-02 10:40:49 +08:00
yuanshuai 667c1a1845 神魂绑定条件修改提交 2021-11-02 10:27:29 +08:00
duhui 5ce581f898 支付端口redis缓存 2021-11-02 10:01:40 +08:00
yuanshuai 7c1b05d419 -神魂绑定修改 2021-11-01 18:54:48 +08:00
jiahuiwen 30fbdc5683 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-11-01 18:39:16 +08:00
jiahuiwen 449efd9de5 优化http 关闭连接 2021-11-01 18:39:03 +08:00
yuanshuai 5c0c449856 神魂绑定检测条件代码修改 2021-11-01 18:32:03 +08:00
xuexinpeng e3813d4e47 玉虚打机器人先后手 2021-11-01 17:30:06 +08:00
jiahuiwen 61bb5e7e14 删除修复bug代码 2021-11-01 15:44:16 +08:00
jiahuiwen 922f532aca 优化log 2021-11-01 15:28:15 +08:00
jiahuiwen b8e9545c55 删除无用方法 2021-11-01 15:26:43 +08:00
jiahuiwen 51e47e6588 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-11-01 15:25:54 +08:00
duhui 6b577dca45 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-11-01 15:00:43 +08:00
duhui 74c7f78291 无尽秘宝网页支付 2021-11-01 15:00:30 +08:00
xuexinpeng 032ce3646d 玉虚三个修改 玉虚赛季发奖时间 挑战后自动换一批 战斗的先后手问题
注释周卡相关
2021-11-01 15:00:09 +08:00
jiahuiwen 77b9fb6426 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-11-01 14:23:52 +08:00
duhui 59f9bf9f70 Merge branch 'dh_dev' into master_test_gn 2021-11-01 14:01:20 +08:00
duhui 121c01dce1 道具,坐骑碎片 2021-11-01 14:00:43 +08:00
xuexinpeng fc2d33d4c9 周卡相关 2021-11-01 13:18:29 +08:00
duhui 182244cfb0 好友获取优化 2021-11-07 10:43:49 +08:00
duhui 0692f312fa 玲珑宝阁问题修改 2021-11-04 18:04:59 +08:00
jiahuiwen eadaa7d40e Merge branch 'master_prb_gn' into master_test_gn 2021-11-01 10:07:11 +08:00
jiahuiwen 7747c85c86 罗浮争锋修复bug 2021-10-31 21:28:06 +08:00
jiahuiwen b58f222669 Merge branch 'master_prb_gn' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2021-10-31 16:29:34 +08:00
jiahuiwen 3388120fa1 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-10-31 16:17:24 +08:00
jiahuiwen dfdd659e0c 优化 2021-10-31 16:17:17 +08:00
jiahuiwen 452462606d 计算世界等级bug 2021-10-30 15:01:52 +08:00
jiahuiwen 29194289cc 分解英雄,和升星吞 2021-10-30 02:20:57 +08:00
jiahuiwen faa21bb46f 白金装备增加过滤掉脱装备获得 2021-10-30 01:43:45 +08:00
duhui cdd3b6b7dd 玲珑宝阁,奖池分活动 2021-10-29 17:19:44 +08:00
jiahuiwen ff57fe280e 修复商店 2021-10-29 16:19:26 +08:00
jiahuiwen 59c91e3233 修复指定活动 2021-10-29 16:10:22 +08:00
jiahuiwen 40ae6b6a1b 添加日志 2021-10-29 16:02:35 +08:00
jiahuiwen de7c59dff1 Merge branch 'master_test_gn_zf' into master_prb_gn 2021-10-29 15:50:00 +08:00
jiahuiwen 97e23512f2 热更修复bug 2021-10-29 15:49:40 +08:00
yuanshuai 3e2455b84a 神魂功能战斗相关修改 2021-10-29 13:26:43 +08:00
yuanshuai f39af137f9 Merge branch 'master_test_gn' into master_test_gn_godsoul 2021-10-29 11:39:38 +08:00
duhui 3524c6ea23 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-10-29 11:00:18 +08:00
duhui d6fcda16a0 gm轩辕宝镜跳关 2021-10-29 11:00:03 +08:00
jiahuiwen bf1a911880 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-10-29 10:53:14 +08:00
jiahuiwen 542563c2c3 删除日志 2021-10-29 10:53:03 +08:00
duhui 17a8cc3811 车迟斗法积分为0处理 2021-10-29 10:51:29 +08:00