Commit Graph

5828 Commits (f9eda6dfe0894d52c002b67b97391308e70022ca)
 

Author SHA1 Message Date
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
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
yuanshuai 8cfbd6ab5e 二期推送需求优化完善 2021-10-15 13:58:52 +08:00
yuanshuai bf0652a4ad 二期推送需求修改提交 2021-10-15 10:54:06 +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
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
yuanshuai 8dceb89111 白金装备提交 2021-10-14 13:47:14 +08:00
jiahuiwen aa21c96a4f 点金数量精度计算bug 2021-10-13 15:38:03 +08:00
yuanshuai e8426e7de2 点金bug修改 2021-10-13 14:38:53 +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
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
yuanshuai 7e9469ee38 四象心法飘字提示修改 2021-10-11 11:08:30 +08:00
jiahuiwen 86dae30e4f 点金 减少精度 2021-10-09 15:34:21 +08:00
jiahuiwen ccc07db16b 点金特权加成 2021-10-09 11:18:50 +08:00
jiahuiwen f9115627b9 Merge branch 'master_test_gn_zf' into master_test_gn 2021-10-09 11:06:31 +08:00
jiahuiwen 3df6b64f82 删错误宝器bug 2021-10-09 11:06:03 +08:00
jiahuiwen 24da18a4e4 点金增加特权加成 2021-10-08 14:54:20 +08:00
jiahuiwen bb6ef14fcf 点石成金基础收益随着玩家等级提升,玩家等级提升时 发放道具进背包 2021-10-08 11:11:24 +08:00
jiahuiwen 7303e9d92d Merge branch 'master_test_gn_zf' into master_test_gn 2021-09-30 17:34:53 +08:00
jiahuiwen 4133f80879 网页支付bug 2021-09-30 17:34:16 +08:00
jiahuiwen 11ba70d8bc Merge branch 'master_prb_gn' into master_test_gn 2021-09-30 14:28:55 +08:00
jiahuiwen 93eb07e78d 云游商人bug 2021-09-30 14:28:31 +08:00
jiahuiwen 6386448536 Merge branch 'master_test_gn_zf' into master_test_gn 2021-09-29 18:10:18 +08:00
jiahuiwen 54b53fda54 战斗力时事计算 2021-09-29 18:09:37 +08:00
yuanshuai 235a3d3a8c Merge branch 'master_test_gn_likable' into master_test_gn 2021-09-29 15:45:09 +08:00
jiahuiwen 4376b5ece7 删除key* 2021-09-29 15:23:15 +08:00
jiahuiwen 80c0a72ac9 删除 keys* 2021-09-29 14:54:59 +08:00
xuexinpeng 8437b6f9ea 海洋改掉落 2021-09-29 14:34:00 +08:00
yuanshuai 9c1f77abfb bug修改 2021-09-28 17:37:54 +08:00
duhui f846e981d1 奇门遁甲,代码格式优化 2021-09-28 16:51:40 +08:00
duhui b06a1b3124 玲珑宝阁奖励提交 2021-09-28 14:59:56 +08:00
yuanshuai be9fa17c70 【好感度】bug修改 2021-09-28 12:05:32 +08:00
jiahuiwen 8903413162 修复玩家魂宝灵宝 2021-09-27 20:40:15 +08:00
duhui dc98d0fc75 车迟斗法战斗bug修改 2021-09-27 18:01:53 +08:00
duhui 93a0b5bf50 战斗修改 2021-09-27 17:53:04 +08:00
jiahuiwen 55d71eaa4d Merge branch 'master_prb_gn' of http://60.1.1.230/backend/jieling_server into master_prb_gn 2021-09-27 17:23:14 +08:00