Commit Graph

5444 Commits (6829317447f5e2f0e68d5c35a420c2ef10b9caf3)

Author SHA1 Message Date
yuanshuai 4b3a1a1e42 修行技能逻辑提交 2021-10-19 15:40:05 +08:00
yuanshuai 31a31cbcd2 修行技能代码提交 2021-10-21 10:46:11 +08:00
xuexinpeng 8db77db94c Merge branch 'master_test_gn' into master_test_gn_xxp 2022-01-03 01:09:23 +08:00
xuexinpeng e7d2136f49 team跨服名字 2022-01-03 01:03:59 +08:00
xuexinpeng 7281a39cd2 查看队伍team新接口 帮会id赋值 2022-01-03 01:01:52 +08:00
xuexinpeng 0994b02b85 工会名字 2022-01-03 00:35:02 +08:00
xuexinpeng b0e341601e 罗浮争锋排行榜信息 2022-01-03 00:24:50 +08:00
xuexinpeng bd6d205053 罗浮争锋team消息 2022-01-03 00:03:20 +08:00
xuexinpeng c8c42ddf9d 罗浮争锋队伍请求 2021-12-27 00:47:41 +08:00
xuexinpeng 5345bbaad4 重置奖励修改 2021-12-27 00:40:01 +08:00
xuexinpeng b99f3dffce yx积分重置 exp显示 2021-12-27 00:05:38 +08:00
DESKTOP-98AVA47\Administrator fb75fd38c6 排行榜本服查看英雄信息exp等级显示问题 2021-10-30 09:25:53 +08:00
duhui 1af270944c 罗浮争锋,全局参数{state}修改到redis 2021-10-29 17:29:00 +08:00
jiahuiwen d70cbe1509 Merge branch 'master_prb_gn' into master_test_gn 2021-10-19 11:14:56 +08:00
xuexinpeng f57360a851 yx重新晋级仍发奖bug 2021-10-25 00:05:47 +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 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
xuexinpeng e5736e509e yxld10/14 2021-10-14 17:27:59 +08:00
yuanshuai c95cd0c10b 羁绊属性容错处理 2021-10-14 17:10:09 +08:00
duhui 2c1e22ee0d 次数验证 2021-10-14 17:08:03 +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 bfc5667bb8 Merge branch 'master_test_gn' into dh_dev_ridingsward
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
2021-10-14 16:18:26 +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
duhui 1e7cc6dea2 御剑飞行 2021-10-14 11:12:23 +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
xuexinpeng fef22e4ae3 yx1.匹配规则的修改
2.战斗回放战力显示
    3.玩家初始化积分
2021-10-09 20:24:50 +08:00
jiahuiwen 86dae30e4f 点金 减少精度 2021-10-09 15:34:21 +08:00
xuexinpeng fd70ebb1c3 yx领奖 2021-10-09 11:57:14 +08:00
xuexinpeng 40ec544c1a yx领奖bug 2021-10-09 11:24:11 +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
xuexinpeng a03ee2095c 玉虚论道10.8 2021-10-09 10:57:12 +08:00
jiahuiwen 24da18a4e4 点金增加特权加成 2021-10-08 14:54:20 +08:00