Commit Graph

6408 Commits (bac38e2d337b789a3aac7260e51fdceb2265bab4)

Author SHA1 Message Date
duhui 8b655778b9 爱玩信息上报 2022-04-12 17:55:10 +08:00
duhui 1354ec8bf3 爱玩信息上报 2022-04-12 17:42:58 +08:00
xuexinpeng deebea6ab1 删除注释的代码 2022-04-12 14:38:18 +08:00
xuexinpeng 3dab8ba9a3 功能注释 2022-04-12 10:18:12 +08:00
duhui 0399861e6b 协议去除无用参数 2022-04-11 13:06:25 +08:00
xuexinpeng fbd3281ca6 探索优化 2022-04-08 18:29:30 +08:00
duhui 6f805a716f 协议去除无用参数 2022-04-08 10:56:41 +08:00
duhui 16a1f881dd 爱玩信息上报 2022-04-08 10:45:13 +08:00
jiahuiwen 921fbf9cc7 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2022-04-07 18:31:04 +08:00
jiahuiwen 42d5e3a6db 修改redis地址 2022-04-07 18:30:50 +08:00
xuexinpeng 814d5d6cd9 探索优化 2022-04-07 11:32:31 +08:00
duhui 77679ba892 家园强化修改 2022-04-07 11:09:30 +08:00
xuexinpeng 77a87f7ccd 探索优化 2022-04-07 10:51:34 +08:00
jiahuiwen 2bd61083e2 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2022-04-06 15:43:00 +08:00
jiahuiwen cb3ebd6372 玉虚论道 赋值职业 2022-04-06 15:42:50 +08:00
duhui 26d5114213 rpc链接socket设置超时时间 2022-04-06 14:58:57 +08:00
jiahuiwen ce712afeac 神魔 卸下魂宝灵宝 2022-04-06 14:05:03 +08:00
jiahuiwen cc668d9147 神魔 卸下魂宝灵宝 2022-04-06 13:43:50 +08:00
jiahuiwen 6b81fc069a 玉虚论道 增加职业 2022-04-02 16:02:42 +08:00
jiahuiwen f945915126 HARD_STAGE_FIGHT_START_REQUEST 怪物职业赋值 2022-04-02 15:19:52 +08:00
jiahuiwen 2d2dba9374 神魔职业遗漏 2022-04-02 14:47:52 +08:00
yuanshuai b48082bbab 神魔遗漏代码添加 2022-04-02 14:01:53 +08:00
duhui 2791d19ee0 【山河设计图每日玉衡龙魂丹领取调整】 2022-04-02 13:48:21 +08:00
xuexinpeng f22b7b0c94 探索注释打开 2022-04-01 17:58:46 +08:00
yuanshuai 434366cdd3 神魔阵营转职功能bug修改 2022-03-31 17:16:57 +08:00
yuanshuai 38de0cae30 神魔bug修改 2022-03-31 16:35:51 +08:00
yuanshuai 4d0ff71928 神魔遗漏代码 2022-03-31 15:07:08 +08:00
yuanshuai a991708d8e Merge branch 'master_test_gn' into master_test_gn_GodDevil 2022-03-31 09:59:58 +08:00
xuexinpeng cb85945e06 功能注释 2022-03-29 11:27:44 +08:00
duhui 257205b847 车迟斗法挑战人数问题处理,修改完善2 2022-03-29 11:23:22 +08:00
duhui c2bd8a261a Merge remote-tracking branch 'origin/master_test_gn' into master_test_gn 2022-03-29 11:21:36 +08:00
duhui 8aeef0695d 车迟斗法挑战人数问题处理,修改完善 2022-03-29 11:21:22 +08:00
xuexinpeng 59f4fa0077 注释探索功能 2022-03-29 11:16:45 +08:00
duhui eb8327464a 车迟斗法挑战人数问题处理,补充 2022-03-29 10:52:44 +08:00
duhui b0918e4071 车迟斗法挑战人数问题处理 2022-03-29 10:51:10 +08:00
duhui fe4e985187 【车迟斗法调整为开服7日后开启】 2022-04-20 14:10:06 +08:00
jiahuiwen 02134b84c8 战力前后端不一致 bug 2022-03-29 10:10:06 +08:00
yuanshuai 18c2ef0b7b Merge branch 'master_test_gn' into master_test_gn_GodDevil
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java
2022-03-25 18:15:15 +08:00
yuanshuai cb1558f309 脚本修改提交 2022-03-25 18:12:26 +08:00
yuanshuai a53c1d8f97 新增字段赋值 2022-03-25 16:55:00 +08:00
yuanshuai 9bbcb33469 脚本修改提交 2022-03-25 16:14:06 +08:00
xuexinpeng d2c5355948 探索事件 2022-03-25 10:17:27 +08:00
xuexinpeng d3da540689 探索事件 2022-03-24 13:39:39 +08:00
xuexinpeng 73ad9d7c4c 探索事件 2022-03-24 10:47:39 +08:00
xuexinpeng 3bc2c1df69 探索事件 2022-03-23 16:08:10 +08:00
xuexinpeng 86a91c0c2a 探索事件 2022-03-23 13:47:18 +08:00
xuexinpeng c15ab64462 探索事件 2022-03-22 17:20:23 +08:00
duhui b64c22c7a9 Merge remote-tracking branch 'origin/master_test_gn' into master_test_gn 2022-03-22 10:23:08 +08:00
duhui 8e1795eb33 东海寻仙,活动报错处理 2022-03-22 10:21:52 +08:00
yuanshuai e29efe8a19 修行技能战力加成脚本提交 2022-03-21 17:38:05 +08:00
duhui 9095583374 备用任务类型 2022-03-21 16:57:37 +08:00
xuexinpeng 293e9869b4 探索事件 2022-03-21 16:33:26 +08:00
yuanshuai cc06e2f19b 新增神魔转职功能相关修改 2022-03-21 15:03:40 +08:00
duhui 204c7e9d0c 东海寻仙活动:bug修改 2022-03-21 10:21:08 +08:00
yuanshuai dc0c9819bd 神魔阵营功能脚本提交 2022-03-18 16:45:25 +08:00
xuexinpeng 738ef9c1e2 探索事件 2022-03-18 11:50:59 +08:00
duhui f588bc7c36 东海寻仙活动:bug修改 2022-03-17 16:01:22 +08:00
yuanshuai 87680c4a56 主角被动技能bug修改(修复前后端战斗不一致) 2022-03-17 14:30:47 +08:00
duhui f7848be28d 东海寻仙活动:初版未测试 2022-03-16 14:35:28 +08:00
yuanshuai 927cbee86c 主角被动技能bug修改 2022-03-16 13:40:15 +08:00
yuanshuai 822aea186f 主角技能改被动技能代码修改提交 2022-03-11 17:13:54 +08:00
duhui 3e10197728 车迟斗法公会人数问题处理 2022-03-11 15:25:04 +08:00
duhui 7f4f430602 车迟斗法积分超过int上限问题处理3 2022-03-11 13:25:04 +08:00
duhui 2769559f0c 车迟斗法积分超过int上限问题处理2 2022-03-10 18:30:50 +08:00
duhui 2f4fcd21cc 车迟斗法积分超过int上限问题处理 2022-03-10 18:22:03 +08:00
duhui 66580a4055 网页支付特殊处理刷新时间单位问题处理 2022-03-10 18:04:53 +08:00
duhui 97598cb7a8 跨服排行榜刷新时间单位问题处理 2022-03-10 17:53:44 +08:00
duhui 71b403e608 车迟斗法积分显示和排行榜转圈优化 2022-03-10 11:00:53 +08:00
duhui aa24961454 车迟斗法,公会人数问题处理 2022-03-08 18:25:06 +08:00
xuexinpeng fe1f6b59d8 rpc活动数据报错 2022-03-08 17:02:18 +08:00
duhui b01fa4c67f rpc,活动数据报错问题处理 2022-03-08 16:58:40 +08:00
xuexinpeng 9ccb9e12da 活动结束未领奖励发邮件 2022-03-09 22:25:09 +08:00
xuexinpeng ba4f2e87bb 达标任务在活动结束后的展示阶段也不能完成 2022-03-07 15:15:44 +08:00
xuexinpeng 160a26e109 达标任务在活动结束后的展示阶段也不能完成 2022-03-10 21:39:30 +08:00
duhui ea003bf9ce 【车迟斗法改为跨服玩法】挑战记录显示问题 2022-03-04 17:56:32 +08:00
duhui 1ca7f410b3 【车迟斗法改为跨服玩法】公会名无法显示问题 2022-03-04 14:37:33 +08:00
duhui fa9d396051 【车迟斗法改为跨服玩法】跨服战斗报错,和无积分问题 2022-03-04 13:31:35 +08:00
duhui 95da9033b8 车迟斗法改为跨服玩法,清除上期数据 2022-03-04 11:25:54 +08:00
duhui f42013ba08 车迟斗法改为跨服玩法,优化 2022-03-03 18:27:22 +08:00
xuexinpeng 0d50b13db8 1.探索结束后得邮件加入你本次队伍一共击杀了多少敌人,死亡多少次
2.战力冲刺任务按钮完成状态按最高战力判断,实际领取按当前战力校验
.
2022-03-03 18:33:12 +08:00
duhui 8d7b7bdeb3 车迟斗法改为跨服玩法 2022-03-05 15:39:20 +08:00
jiahuiwen 85b48640cd 删除无用代码 2022-03-03 11:56:43 +08:00
duhui 00b6a93c53 四灵试炼战斗记录从redis转移到mongodb 2022-03-02 13:13:06 +08:00
xuexinpeng 837174f0cd 周礼包根据不同等级推不同的礼包 2022-03-01 14:48:39 +08:00
jiahuiwen 74463746c4 减少聊天信息缓存 2022-03-01 13:16:09 +08:00
jiahuiwen 1dafc96c7c Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2022-03-01 11:34:13 +08:00
jiahuiwen 6df96edad6 优化redis key 2022-03-01 11:34:01 +08:00
xuexinpeng bb2d555e64 排行榜 2022-02-28 11:55:59 +08:00
xuexinpeng 2ada704ba3 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2022-02-28 10:46:29 +08:00
xuexinpeng cb76090d01 排行榜 2022-02-28 10:45:06 +08:00
jiahuiwen 5227b6ea0c USER_LOGIN_URL 设置过期时间 2022-02-28 10:39:54 +08:00
jiahuiwen 186ed8f82c Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2022-02-28 10:37:46 +08:00
jiahuiwen f53ddd0d59 WORLD_ARENA_RRECORD 巅峰赛战斗记录设置过期时间 2022-02-28 10:37:35 +08:00
xuexinpeng 4c92ff6135 战力冲刺 2022-02-25 14:56:07 +08:00
xuexinpeng 4982b2c70d 战力冲刺邮件奖励 2022-02-25 14:34:58 +08:00
xuexinpeng 84d5015304 战力冲刺排行榜修改 2022-02-25 13:37:49 +08:00
xuexinpeng 4ce354caa5 战力冲刺排行榜调整 2022-02-25 11:52:23 +08:00
jiahuiwen 163a14fe36 修仙增加日志 2022-02-24 13:56:43 +08:00
duhui e6ba9c0ac4 至尊降世活动提高1000档 2022-02-23 18:06:38 +08:00
duhui 9836cab7a7 补充2:跨服分组兼容,当分组id<=0时,表示不用跨服 2022-02-21 17:37:00 +08:00
duhui 803280eaf0 补充:跨服分组兼容,当分组id<=0时,表示不用跨服 2022-02-21 17:17:35 +08:00
duhui dc0eacd113 跨服分组兼容,当分组id<=0时,表示不用跨服 2022-02-21 17:12:37 +08:00
xuexinpeng 900412365d 战力冲刺 2022-02-22 21:02:47 +08:00
duhui 1368922c6d 跨服分组改为gm上手动分组,去除自动分组 2022-02-21 00:11:00 +08:00
jiahuiwen 51b0872905 Merge branch 'master_prb_gn' into master_test_gn 2022-02-20 10:05:13 +08:00
jiahuiwen 7df22af548 规范日志 2022-02-20 10:04:18 +08:00
jiahuiwen af4b08c3d2 重复购买礼包算成功 2022-02-20 09:37:51 +08:00
xuexinpeng 54f6e06a74 活动:战力冲刺 2022-02-18 22:57:40 +08:00
jiahuiwen 6b88e120cd _oaid _imei赋值 deviceid 2022-02-18 16:46:27 +08:00
jiahuiwen 8f7ca009a9 上报增加 _androidid 2022-02-18 16:34:46 +08:00
jiahuiwen df28c22959 上报增加默认值 2022-02-18 13:35:01 +08:00
jiahuiwen 980477b790 上报修改 2022-02-17 20:46:33 +08:00
jiahuiwen f2e2835076 增加报送的头信息 2022-02-17 19:26:02 +08:00
jiahuiwen 283439f860 改post 2022-02-17 19:18:34 +08:00
jiahuiwen a906ad4712 增加字段 2022-02-17 18:53:30 +08:00
jiahuiwen fb94ec7526 金额改字符串 2022-02-17 18:48:36 +08:00
jiahuiwen e9238bd713 openId赋值错误 2022-02-17 18:40:42 +08:00
jiahuiwen f579fbf20c 开天上报打印参数 2022-02-17 18:17:55 +08:00
jiahuiwen 831722996d 开天上报 价格 改为 元 2022-02-17 18:05:36 +08:00
jiahuiwen 5ec60747ef 开天增加充值上报 2022-02-17 17:34:09 +08:00
yuanshuai 4af6f92c99 超值返利兼容老数据bug修改 2022-02-21 16:27:25 +08:00
yuanshuai 0d5a19339b 超值返利兼容老数据bug修改 2022-02-17 16:28:27 +08:00
duhui 1210a30798 【补充】升星操作增加鸿蒙阵等级限制 2022-02-17 14:43:08 +08:00
duhui 0b1295cb61 【优化】升星操作增加鸿蒙阵等级限制 2022-02-17 14:14:19 +08:00
jiahuiwen 91be761235 删除多余代码 2022-02-15 17:54:42 +08:00
jiahuiwen e1a5cd8db8 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2022-02-15 11:34:35 +08:00
jiahuiwen 802a85021e 神将可控制进入版本时间优化 2022-02-15 11:34:25 +08:00
duhui b0a1347ddf 特权刷新日志添加 2022-02-15 10:33:03 +08:00
jiahuiwen b4f4c43a0e Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2022-02-14 17:11:01 +08:00
jiahuiwen cc1f777372 神将可控制进入版本时间 2022-02-14 17:10:51 +08:00
yuanshuai 45d0438456 每日豪礼活动重新开启 2022-02-11 16:59:12 +08:00
jiahuiwen 9b7c9af1cc 大圣升星活动添加判断 2022-02-11 15:25:48 +08:00
yuanshuai e2fc3f54cd 超值返利活动修改提交 2022-02-26 00:05:29 +08:00
xuexinpeng 92b7b7ee82 每日特惠 2022-02-11 11:25:49 +08:00
xuexinpeng 1ccd802b2d Merge branch 'master_prb_gn' into master_test_gn 2022-02-10 16:46:56 +08:00
xuexinpeng 647882cd4e 注释掉每日特惠中60元七天特惠活动 2022-02-10 16:19:55 +08:00
yuanshuai cafea7ce46 大闹天宫开战报错bug修改 2022-02-10 15:05:13 +08:00
yuanshuai 3544b10c47 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2022-02-10 15:04:05 +08:00
yuanshuai 4443ac1bf2 大闹天宫开战报错bug修改 2022-02-10 15:03:52 +08:00
jiahuiwen 63cf33f5d4 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2022-02-10 11:28:36 +08:00
jiahuiwen 6053cf9db9 神将可控制进入版本时间 2022-02-10 11:28:33 +08:00
duhui b3b7ce5ed7 日志级别调整 2022-02-08 18:26:13 +08:00
jiahuiwen acb0dcb9d3 探索优化 2022-01-26 15:06:16 +08:00
xuexinpeng 36e8abdb61 探索相关报错 2022-01-26 13:44:38 +08:00
xuexinpeng 6f9a1ee82c log相关 2022-01-25 13:43:02 +08:00
DESKTOP-98AVA47\Administrator 0c84030817 超值基金bug修改 2022-01-18 01:10:52 +08:00
duhui b94adebdc7 超值基金活动修改,线上兼容2 2022-01-24 18:03:13 +08:00
duhui a29f8a08c2 超值基金活动修改,线上兼容 2022-01-24 17:31:49 +08:00
duhui 121bd7924f 超值基金活动修改 2022-01-24 17:10:11 +08:00
jiahuiwen a7c5616dbf Merge branch 'master_prb_gn' into master_test_gn 2022-01-24 10:58:53 +08:00
duhui 73687ceeaa 新增主角时装类型
(cherry picked from commit e2c331f840)
2022-01-22 14:27:54 +08:00
xuexinpeng fe971df10d 探索公会重置 2022-01-22 11:31:16 +08:00
xuexinpeng 09efdc1b7a 探索退出公会重置个人数 2022-02-10 01:00:05 +08:00
xuexinpeng 02f41921ab 探索达人 2022-02-04 16:38:47 +08:00
xuexinpeng 9310dcfc4f 探索达人 2022-02-10 00:04:06 +08:00
xuexinpeng 85969b7acf 探索bug 2022-01-21 17:19:47 +08:00
yuanshuai 1f3fce5ece 战斗力不一致bug修复(总好感度属性加成导致的) 2022-01-20 15:17:00 +08:00
duhui 12600a3bed Merge branch 'master_test_gn_zf' into master_test_gn 2022-01-19 17:05:44 +08:00
duhui df9f1501c2 家园特权,重复购买问题解决 2022-01-19 17:04:52 +08:00
yuanshuai 19ab726801 Merge branch 'master_test_gn' into master_test_gn_feisheng 2022-01-19 16:31:10 +08:00
yuanshuai 925b06352f Merge branch 'master_test_gn' into master_test_gn_feisheng
# Conflicts:
#	tablemanager/src/main/java/config/SSpecialConfig.java
2022-01-22 11:14:33 +08:00
jiahuiwen 64fc286053 Merge branch 'master_prb_gn' into master_test_gn 2022-01-18 16:32:14 +08:00
yuanshuai 89152453e6 节日登录活动提交 2022-02-13 23:59:56 +08:00
jiahuiwen 2203e54375 优化代码 2022-01-18 16:31:48 +08:00
duhui 3e3e5ee1bf 牛气冲天任务优化 2022-01-18 10:06:09 +08:00
jiahuiwen 351909d5f3 鸿蒙阵推送 2022-01-18 09:56:28 +08:00
jiahuiwen ff3c81bfbe Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2022-01-17 18:59:05 +08:00
jiahuiwen fc6bf6f613 家园任务bug 2022-01-17 18:58:56 +08:00
xuexinpeng 4bbf743013 断线重连探索 2022-01-17 18:34:22 +08:00
xuexinpeng 6bd1bb83ee 规范部分log 2022-01-17 11:16:47 +08:00
xuexinpeng 2aecb022a6 探索冲突 2022-01-15 18:46:26 +08:00
jiahuiwen c3075fadb4 Merge branch 'master_test_gn_zf' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/explorerMap/ExplorerMapLogic.java
2022-01-15 18:44:15 +08:00
xuexinpeng eb9ed25093 探索报空 2022-01-15 18:33:19 +08:00
xuexinpeng 3a1a61171a SExplore判空 2022-01-15 18:27:25 +08:00
xuexinpeng 315083312d 【玩家信息优化】玩家信息中新增身外化身,四象心法,命格和坐骑信息 2022-01-15 16:38:31 +08:00
jiahuiwen ee98e74895 类型转换错误 2022-01-15 11:43:57 +08:00
jiahuiwen cf6c9cc9ff Merge branch 'master_prb_gn' into master_test_gn 2022-01-15 11:08:09 +08:00
jiahuiwen 5cecf52687 森罗幻境阵容bug 2022-01-15 11:07:23 +08:00
duhui 70d69c58b4 每日特惠活动 2022-01-15 10:09:18 +08:00
xuexinpeng 129e31c61f 断线重连玩家处理/log 2022-01-14 13:56:52 +08:00
xuexinpeng 8aa8865f42 【玩家信息优化】玩家信息中新增身外化身,四象心法,命格和坐骑信息 2022-01-14 11:41:57 +08:00
xuexinpeng 8dd658edc5 【玩家信息优化】玩家信息中新增身外化身,四象心法,命格和坐骑信息 2022-01-13 18:32:39 +08:00
yuanshuai f5ea9a3b8c 天地洪炉脚本抽奖脚本完善 2022-01-13 15:12:29 +08:00
yuanshuai 144ea73fa0 代码整理 2022-01-12 10:15:53 +08:00
jiahuiwen 996169647e Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2022-01-11 14:00:08 +08:00
duhui f305dea91f 修改注释 2022-03-14 00:01:18 +08:00
jiahuiwen d352dbb972 Merge branch 'master_test_gn' into master_test_gn_upStarHeroActiviry 2022-01-11 11:09:46 +08:00
yuanshuai 813ca52e63 英雄升星活动选择英雄限制 2022-01-22 16:30:21 +08:00
yuanshuai bb15b379ea 升星活动脚本修改提交 2022-01-22 16:20:41 +08:00
yuanshuai c532cad640 多提交的内容还原 2022-01-22 10:53:53 +08:00
yuanshuai 2594a30e6a 新版升星活动脚本提交 2022-01-20 18:36:25 +08:00
duhui 6f35e726a0 家园建筑gm,修改1 2022-01-10 18:21:28 +08:00
duhui f0a19957b2 家园建筑gm 2022-01-10 18:18:27 +08:00
yuanshuai 69166c0950 天地洪炉抽卡特殊处理 2022-01-22 16:24:57 +08:00
yuanshuai 1367f81092 天地洪炉bug修改 2022-01-10 13:44:39 +08:00
yuanshuai 058cb045ce 天地洪炉bug修改提交 2022-01-10 13:42:45 +08:00
yuanshuai e9b492ee5d 天地洪炉抽奖bug修改 2022-01-10 12:07:44 +08:00
duhui c03ae4a02f 易经宝库gm 2022-01-06 18:14:26 +08:00
xuexinpeng a7c2a5a71f 森罗幻境自动挂机返回掉落展示清除 2022-01-06 16:25:22 +08:00
duhui 718ca61a46 Merge branch '开发/dev_dh' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	tablemanager/src/main/java/config/SHomeLand.java
#	tablemanager/src/main/java/config/SHomeLandLevel.java
#	tablemanager/src/main/java/config/SSpecialConfig.java
2022-01-06 16:15:00 +08:00