Commit Graph

5694 Commits (5d4ef3ac50f937d47c4a1d9ecbf4f6758df59005)
 

Author SHA1 Message Date
jiahuiwen 5d4ef3ac50 BlessingConfigNew 表 basicPoolId 改 String 2021-09-18 10:43:52 +08:00
jiahuiwen a5e82c01a0 Merge branch 'master_test_gn' into master_prb_gn 2021-09-17 16:47:07 +08:00
jiahuiwen 8427f08a4a 还原战力计算公式 2021-09-17 16:20:13 +08:00
duhui 01457210b5 本地gm,四灵跳关 2021-09-17 14:09:25 +08:00
jiahuiwen 484298240c Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-09-17 11:40:01 +08:00
jiahuiwen e125b19b99 战斗力公式修改 2021-09-17 11:39:48 +08:00
duhui dfc615ae0a 鸿蒙阵英雄魂印问题处理 2021-09-16 16:41:57 +08:00
duhui 9e964a10f1 日志调整 2021-09-16 11:27:57 +08:00
duhui 42cbcab535 鸿蒙阵推送bug处理 2021-09-15 15:52:32 +08:00
xuexinpeng d4b117d4c3 寻宝迷踪打开 2021-09-15 15:15:07 +08:00
duhui 31ce7a2522 鸿蒙阵请求返回 2021-09-21 01:45:46 +08:00
duhui a362ba1838 Merge branch 'master_prb_gn' into master_test_gn 2021-09-27 11:18:31 +08:00
duhui 68239e5634 时间修改 2021-09-27 11:13:53 +08:00
duhui 0219a8ae12 Merge branch 'master_test_gn_zf' into master_prb_gn 2021-09-27 11:12:53 +08:00
duhui 7f1180c2b2 轩辕宝镜礼包推送 2021-09-27 11:12:30 +08:00
duhui 4679fb5af2 十绝伤害超上限 2021-09-27 11:09:52 +08:00
DESKTOP-98AVA47\Administrator c39cb8eac6 十绝阵刷新 2021-09-22 11:09:06 +08:00
DESKTOP-98AVA47\Administrator 95223a0c98 测试回滚 2021-09-22 10:18:53 +08:00
duhui b70260fc88 Merge branch 'master_prb_gn' of http://60.1.1.230/backend/jieling_server into master_prb_gn 2021-09-14 20:06:52 +08:00
duhui 1c3fdf907c 数数修改 2021-09-14 20:06:34 +08:00
jiahuiwen 713dda777f 礼包推送 增加判断 2021-09-14 15:49:29 +08:00
jiahuiwen b6f4eb1b24 轩辕宝镜礼包增加 推送扫荡推送 2021-09-14 14:53:24 +08:00
duhui eeac777798 版本号读表 2021-09-13 17:52:00 +08:00
duhui 081266e83d 十绝阵定时清理 2021-09-13 13:58:12 +08:00
duhui 045e1ce82f 跨服十绝阵 2021-09-13 11:37:48 +08:00
duhui 884e3b1276 老跨服代码注释 2021-09-10 20:13:21 +08:00
duhui 2fd6b82d04 十绝阵兼容 2021-09-10 19:51:44 +08:00
duhui 686f22d60d 竞技场刷新 2021-09-10 19:12:34 +08:00
duhui 8a05dbe235 Merge branch 'dh_dev_rediskey' of http://60.1.1.230/backend/jieling_server into dh_dev_rediskey 2021-09-10 18:29:04 +08:00
duhui 59b4e12b17 公会援助刷新回滚 2021-09-10 18:28:52 +08:00
duhui aa040195e0 竞技场每日发奖 2021-09-14 00:35:05 +08:00
duhui 7af7724b0c Merge branch 'master_test_gn' into dh_dev_rediskey 2021-09-14 00:07:34 +08:00
duhui 987f4c6729 十绝阵删除key 2021-09-14 00:07:25 +08:00
jiahuiwen 8b3031f9b9 DEATH_PATH 2021-09-10 18:11:29 +08:00
duhui 989f45f926 Merge branch 'master_test_gn_zf' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java
2021-09-10 16:01:28 +08:00
duhui 2e03d50d47 Merge branch 'master_prb_gn' into master_test_gn 2021-09-10 15:59:42 +08:00
duhui 393635b930 第一版 2021-09-10 15:57:48 +08:00
jiahuiwen 47a2e454aa 轩辕宝镜礼包只胜利推送 2021-09-10 14:46:02 +08:00
jiahuiwen 9b4654b3a6 优化删帮派boos排行榜 使用 keys * 2021-09-10 14:14:22 +08:00
yuanshuai e819858d77 Revert "四象心法"
This reverts commit 9178024c9f.
2021-09-09 20:25:53 +08:00
yuanshuai 31c1268a27 Revert "冲突修改"
This reverts commit 987c524652.
2021-09-09 20:25:40 +08:00
duhui bf4ed2054a Merge branch 'master_prb_gn' into master_test_gn_zf 2021-09-09 19:25:44 +08:00
duhui 2972a394a5 礼包限购优化 2021-09-09 19:12:35 +08:00
duhui d0acbe1f46 公会刷新日志 2021-09-09 17:09:23 +08:00
yuanshuai 987c524652 冲突修改 2021-09-09 17:03:29 +08:00
yuanshuai ea4430e298 Merge branches 'master_test_gn' and 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-09-09 16:58:43 +08:00
yuanshuai 9178024c9f 四象心法 2021-09-09 16:58:28 +08:00
duhui 42bcad935b 封装优化 2021-09-09 16:57:33 +08:00
yuanshuai 70b92f1b91 Merge branch 'dev_dh_fourSpirit2' into master_test_gn 2021-09-09 16:36:32 +08:00
jiahuiwen 6020686a9c 宝物礼包推送修改 2021-09-09 16:32:45 +08:00