Commit Graph

6055 Commits (7c1b05d419a8ac765b81d32293b08d57f7a1462b)
 

Author SHA1 Message Date
jiahuiwen a14a205cfa 修仙技能 2021-10-19 11:13:36 +08:00
yuanshuai bd0f84629b 萌新活动修改 2021-10-19 09:50:56 +08:00
duhui b60d589ee9 御剑行剧本一周期一算 2021-10-19 00:13:21 +08:00
jiahuiwen 2c643c4a31 屏蔽开服时间前任务 2021-10-18 20:17:12 +08:00
xuexinpeng 0fb715e75f yx属性显示 2021-10-18 16:37:13 +08:00
jiahuiwen 65f905837f 更新敏感字库 2021-10-18 16:20:58 +08:00
jiahuiwen 51f6403add 更新敏感字库 2021-10-18 16:19:34 +08:00
xuexinpeng 875484ac61 yx属性 2021-10-18 16:17:15 +08:00
xuexinpeng 375951b7d5 yx跨服打架灵兽,段位重置1000 2021-10-18 15:10:18 +08:00
xuexinpeng b21cb8f45a 跨服白金套装技能,坐骑技能 2021-10-30 01:00:06 +08:00
DESKTOP-98AVA47\Administrator 4efe978e82 Merge branch 'master_test_gn_xxp' of http://60.1.1.230/backend/jieling_server into master_test_gn_xxp 2021-10-23 03:51:54 +08:00
DESKTOP-98AVA47\Administrator 7591a7e980 七界试炼 2021-10-23 03:51:05 +08:00
DESKTOP-98AVA47\Administrator 12b92a4250 共鸣装备看不到 2021-10-23 01:36:40 +08:00
xuexinpeng f080e07e6a Merge branch 'master_test_gn' into master_test_gn_xxp 2021-10-16 21:09:56 +08:00
xuexinpeng 5974b1a730 跨服罗浮争锋 玉虚高分段没有匹配到机器人规则 2021-10-16 19:14:15 +08:00
xuexinpeng 590003cee9 yx积分 2021-10-16 18:35:13 +08:00
xuexinpeng 659a88a932 yxbug 2021-10-16 18:04:49 +08:00
jiahuiwen 07ef70e1d9 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-10-16 17:47:07 +08:00
yuanshuai c96fc8d7ec 推送bug修改 2021-10-21 15:02:12 +08:00
jiahuiwen b5806bcf26 登录 获取气冲天任务增加进度 2021-10-16 17:46:57 +08:00
xuexinpeng 06c60f4d0a yx查看英雄宝物数字右上标 2021-10-16 15:05:29 +08:00
xuexinpeng ecba1854dd Merge branch 'master_test_gn' into master_test_gn_xxp
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java
2021-10-16 11:44:24 +08:00
xuexinpeng 032c48c8b5 yx跨服属性 2021-10-15 21:06:25 +08:00
xuexinpeng 5c68ad2738 跨服排行榜改动 2021-10-15 20:47:21 +08:00
xuexinpeng 63b1c2de38 yxld赛季重置相关 2021-10-18 00:11:11 +08:00
jiahuiwen 3f86147ef3 根据开服时间决定服务器内的成就 2021-10-15 18:28:10 +08:00
jiahuiwen f9eda6dfe0 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
# Conflicts:
#	tablemanager/src/main/java/config/SAchievementConfig.java
2021-10-15 18:21:48 +08:00
jiahuiwen 7c0c66be39 【成就优化】根据开服时间决定服务器内的成就 2021-10-15 18:20:59 +08:00
xuexinpeng f2c43c9042 yxld 积分 英雄属性 查看英雄 2021-10-15 17:31:16 +08:00
duhui 2f4715b599 Merge branch 'dh_dev_cow' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2021-10-15 17:18:43 +08:00
duhui 6d8a430fab 牛气冲天兼容 2021-10-15 17:16:17 +08:00
yuanshuai 82dd1bd33e Merge branch 'master_test_gn_push' into master_test_gn 2021-10-15 16:52:58 +08:00
duhui 082952c1cc 获得道具问题 2021-10-15 15:55:02 +08:00
duhui da8f356de5 删除排行榜 2021-10-15 15:15:59 +08:00
jiahuiwen b4ad96bba7 处理消息失败 打印异常 2021-10-15 14:06:22 +08:00
xuexinpeng 8b1342df9d yxrpc数据 2021-10-15 14:04:46 +08:00
yuanshuai 8cfbd6ab5e 二期推送需求优化完善 2021-10-15 13:58:52 +08:00
duhui f614593007 二次押注不消耗道具问题处理 2021-10-15 13:57:09 +08:00
xuexinpeng 83a80abd6e yx属性 2021-10-15 12:01:17 +08:00
duhui c44cbff181 不删排行榜了 2021-10-15 11:58:48 +08:00
duhui a7cbcf2323 排行榜处理 2021-10-15 11:45:02 +08:00
xuexinpeng fff846bc3f yx登录请求 2021-10-15 11:26:21 +08:00
yuanshuai bf0652a4ad 二期推送需求修改提交 2021-10-15 10:54:06 +08:00
duhui 93a4f47466 隔天刷新 2021-10-15 10:38:59 +08:00
xuexinpeng f42dfcd0e7 yx红点 2021-10-14 21:47:02 +08:00
xuexinpeng fc18cf8b0e yx红点类型 2021-10-14 21:07:22 +08:00
jiahuiwen 09591d21e0 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-10-14 19:38:11 +08:00
jiahuiwen 44ffcea125 坐骑技能 2021-10-14 19:38:02 +08:00
duhui a30b83494a 邮件修改 2021-10-14 18:23:47 +08:00
duhui a6416fb840 活动结束发送邮件 2021-10-14 18:21:40 +08:00