Commit Graph

5876 Commits (5974b1a73062a6834d7160884361f46af5f82c28)
 

Author SHA1 Message Date
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
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
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
xuexinpeng 83a80abd6e yx属性 2021-10-15 12:01:17 +08:00
xuexinpeng fff846bc3f yx登录请求 2021-10-15 11:26:21 +08:00
yuanshuai bf0652a4ad 二期推送需求修改提交 2021-10-15 10:54:06 +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
xuexinpeng e5736e509e yxld10/14 2021-10-14 17:27:59 +08:00
yuanshuai c95cd0c10b 羁绊属性容错处理 2021-10-14 17:10:09 +08:00
yuanshuai 92b027d90c 根据充值金额推送礼包代码修改 2021-10-14 16:44:14 +08:00
yuanshuai 7bc172d613 Merge branch 'master_test_gn' into master_test_gn_push 2021-10-14 16:36:30 +08:00
duhui ba6a32a114 成就任务优化,兼容开服时间条件,补充 2021-10-14 15:37:40 +08:00
duhui 7ab321cc75 成就任务优化,兼容开服时间条件 2021-10-14 15:36:48 +08:00
yuanshuai 4fe6e452ea 添加装备图鉴修改推送 2021-10-14 15:27:14 +08:00
xuexinpeng 363f5f6a53 yx积分 2021-10-14 14:07:30 +08:00
xuexinpeng 24d983ac2b yx初始积分 2021-10-14 13:47:19 +08:00
yuanshuai 8dceb89111 白金装备提交 2021-10-14 13:47:14 +08:00
xuexinpeng ea3e7cdaf3 yx:计分规则 2021-10-14 11:28:22 +08:00
xuexinpeng 433e651a6c Merge branch 'master_test_gn' into master_test_gn_xxp
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
2021-10-13 19:58:49 +08:00
xuexinpeng c6d45cbecf yx10.13测试bug 2021-10-13 19:52:46 +08:00
jiahuiwen aa21c96a4f 点金数量精度计算bug 2021-10-13 15:38:03 +08:00
yuanshuai e8426e7de2 点金bug修改 2021-10-13 14:38:53 +08:00
xuexinpeng 4a2e7bdf22 yx-聊天gm 2021-10-13 13:37:20 +08:00
jiahuiwen c3c1193e58 Exception in thread "main" java.lang.ClassCastException: java.lang.String cannot be cast to java.lang.Double 2021-10-12 15:01:17 +08:00
xuexinpeng 4f615fb11d yx 1.战斗记录排序 2.没队伍输赢判断3.换一批不能匹配到自己 2021-10-12 14:58:06 +08:00
jiahuiwen eb0d4f892b 网页支付 类型转换错误 2021-10-12 14:09:21 +08:00
yuanshuai 107f7eb458 充值金额礼包推送功能优化 2021-10-12 10:38:45 +08:00
yuanshuai 00a7cb0351 vip初始化好感度特权bug修改 2021-10-11 17:01:36 +08:00
yuanshuai 90eec47c30 礼包推送相关修改 2021-10-11 16:51:37 +08:00
xuexinpeng 37ff5b7ca7 寻宝迷踪新一期不刷新 2021-10-11 15:52:19 +08:00
xuexinpeng 86c3f5d1e9 yx赛季重置 2021-10-11 15:31:03 +08:00
yuanshuai 7e9469ee38 四象心法飘字提示修改 2021-10-11 11:08:30 +08:00