Commit Graph

5229 Commits (b81acfa9dcd93caa36d69f3bd333a38e4a60eb4d)

Author SHA1 Message Date
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
yuanshuai 5bfabb7e7f 【四象心法】跑马灯问题修改 2021-09-14 14:32:17 +08:00
yuanshuai e3a628d5ad Merge branch 'master_test_gn' into master_test_gn_ys
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/SituationLogic.java
2021-09-14 13:57:03 +08:00
yuanshuai 0d7c337ced 【四象心法】添加技能属性加成 2021-09-14 11:36:38 +08:00
yuanshuai d172e4d48f 跑马灯修改 2021-09-14 09:48:53 +08:00
duhui eeac777798 版本号读表 2021-09-13 17:52:00 +08:00
yuanshuai 10cb106a8d 四象心法bug 修改 2021-09-13 17:18:53 +08:00
duhui 081266e83d 十绝阵定时清理 2021-09-13 13:58:12 +08:00
duhui 045e1ce82f 跨服十绝阵 2021-09-13 11:37:48 +08:00
yuanshuai 3a29dc0ce3 【四象心法】bug修改 2021-09-11 18:06:34 +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
yuanshuai 3f2c236333 开启修行等级限制 2021-09-10 15:09:03 +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 d1544c7cee 【四象心法】脚本修改 2021-09-10 09:43:43 +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
duhui 66f27217aa 开服失败提示 2021-09-09 11:25:49 +08:00
duhui 40911b8f24 大闹天宫,商店刷新优化 2021-09-08 14:13:23 +08:00
duhui bdf8522a7f 编队 2021-09-07 11:50:01 +08:00
duhui eb1dfc554e Merge branch 'master_prb_gn' into master_test_gn_zf 2021-09-07 10:15:44 +08:00
DESKTOP-98AVA47\Administrator 9cc7e78add 登峰造极bug修改 2021-09-10 10:13:34 +08:00
duhui e0612fe088 四灵,重复 2021-09-06 17:33:26 +08:00
jiahuiwen 6405173b88 优化上报 2021-09-06 10:57:55 +08:00
duhui 1d58ba91e1 修改数数上报参数 2021-09-06 09:33:15 +08:00
DESKTOP-98AVA47\Administrator b0c8a8627f 登峰造极bug处理 2021-09-05 02:21:32 +08:00
duhui 0a96f7d622 四灵,零点推送 2021-09-04 00:01:20 +08:00
duhui d1815b4e8c 助战bug修改 2021-09-03 14:55:04 +08:00
duhui 79936df349 Merge branch 'master_test_gn' into master_prb_gn 2021-09-03 09:44:00 +08:00
duhui 587d5b33c5 报错修改 2021-09-03 09:43:25 +08:00
duhui bd31b30334 Merge branch 'master_test_gn' into master_prb_gn 2021-09-02 21:06:22 +08:00
duhui e0ee603f12 Merge branch 'dev_dh_fourSpirit2' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java
#	serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
#	serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankEnum.java
2021-09-02 21:02:20 +08:00
duhui 3bb466b720 热更去除 2021-09-04 12:58:43 +08:00
duhui 40f1b0769b Merge branch 'master_test_gn_zf' into master_test_gn 2021-09-04 12:58:05 +08:00
duhui c37f2e6fb7 战力显示 2021-09-04 12:54:25 +08:00
duhui a392424eba 罗浮争锋,机器人等级问题处理 2021-09-04 12:37:12 +08:00
duhui a4730edbd0 跨服十绝阵总排行,占阵次数不对修改 2021-09-03 10:32:52 +08:00
duhui c7a9262a34 英雄属性同步修改 2021-09-02 18:10:50 +08:00
duhui 33c1e09d65 修改编队 2021-09-02 17:30:40 +08:00
duhui 3592547ada 助战英雄战力 2021-09-02 15:25:21 +08:00
duhui ebff88ed90 推送礼包 2021-09-02 13:52:12 +08:00
jiahuiwen 0cf0f239d0 宝物品质 宝物精炼 轩辕宝境 礼包推送 2021-09-02 13:46:53 +08:00
xuexinpeng 6890e0b2dc 鸿蒙碑 2021-09-02 11:45:47 +08:00
xuexinpeng 3824976fb6 玉虚论道 2021-09-02 11:44:00 +08:00
duhui bb94e531e8 鸿蒙阵bug修改 2021-09-02 11:39:53 +08:00
duhui 130e7fd09b 数数公共事件添加 2021-09-02 10:58:07 +08:00
duhui 23b4cb9eb8 四灵,跑马灯 2021-09-01 18:14:42 +08:00
duhui 11073857f8 四灵bug修改和功能优化 2021-09-01 16:50:05 +08:00
duhui 38130a2aa0 四灵,排行榜 2021-08-31 17:53:04 +08:00
duhui bf20b62bf8 报错修改 2021-08-31 11:23:37 +08:00
duhui 771c39577e Merge branch 'master_test_gn' into dev_dh_fourSpirit2
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/family/CrossDeathPathLogic.java
2021-08-31 11:19:47 +08:00
duhui a720fca31c 四灵 2021-08-31 11:09:18 +08:00
duhui 19c3a04559 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into dev_dh_fourSpirit2 2021-09-02 15:17:00 +08:00
duhui fed17b2767 获取好友信息报错,兼容 2021-09-02 11:55:59 +08:00
duhui 52e620b449 跨服十绝阵,推送添加服务器名字 2021-08-30 18:19:51 +08:00
duhui 7c534b9955 Merge branch 'master_test_gn' into master_test_gn_zf 2021-08-30 18:00:40 +08:00
duhui c880ba81a0 跨服十绝阵,次数刷新问题 2021-08-30 18:00:13 +08:00
DESKTOP-98AVA47\Administrator cacac662d3 duhui,青龙秘宝提交 2021-10-01 00:06:09 +08:00
duhui 73200c6578 Merge branch 'master_test_gn_arena' into master_test_gn 2021-09-02 20:32:47 +08:00
duhui 2131ee0ec2 开服十绝阵修改 2021-09-02 20:05:34 +08:00
duhui e8eb2d531a 跨服十绝阵,结束 2021-09-02 18:44:21 +08:00
duhui c934e39777 跨服十绝阵,时间优化 2021-09-02 18:01:02 +08:00
duhui 60df6bcf8f 十绝阵推送 2021-09-02 17:38:56 +08:00
duhui ccd8cf89c3 跨服十绝阵 2021-09-02 17:00:42 +08:00
duhui 610a6e6ec7 跨服十绝阵 2021-09-02 15:20:25 +08:00
duhui 607a2b569a 跨服十绝阵 2021-09-02 13:49:36 +08:00
duhui 6f02df1ee8 跨服十绝阵 2021-08-30 17:22:54 +08:00
duhui 6c60f45c88 Merge branch 'master_test_gn' into master_test_gn_arena 2021-08-30 17:21:10 +08:00
duhui 327bbe281d Merge branch 'master_test_gn' into master_test_gn_zf 2021-08-30 13:45:56 +08:00
duhui 6ae1932181 Merge branch 'master_test_gn' into master_test_gn_zf 2021-09-02 20:34:20 +08:00
duhui 88f82ae849 日志 2021-09-02 17:33:51 +08:00