Commit Graph

6531 Commits (453584cea0c97c5d198f2cd6d1ff0cc9dbcb409c)

Author SHA1 Message Date
duhui 8e3cc63702 新周卡功能 2022-05-31 17:13:59 +08:00
xuexinpeng ad8d491fc9 Merge branch 'master_test_gn' into master_prb_gn 2022-05-25 20:20:43 +08:00
xuexinpeng 9f3e6f2efe 灵脉秘境发奖根据表时间段走 2022-05-25 19:45:05 +08:00
jiahuiwen 04977c5abd Merge branch 'master_test_gn' into master_prb_gn 2022-05-25 17:27:16 +08:00
xuexinpeng 8293b63aca 周卡更改 2022-05-25 16:42:48 +08:00
duhui 2820f24561 寻仙招募修改3 2022-05-24 12:59:15 +08:00
duhui 3a6a3fdf25 寻仙招募修改2 2022-05-24 12:02:36 +08:00
duhui 1f9d9736e6 寻仙招募修改,去除老逻辑 2022-05-24 11:34:06 +08:00
duhui 8c94c1b2ab 跨服分组时间bug 2022-05-23 11:32:42 +08:00
duhui 8b89873629 【寻仙招募调整】2 2022-05-23 10:15:23 +08:00
duhui 3b093d4209 【寻仙招募调整】 2022-05-23 10:08:41 +08:00
jiahuiwen 4c6917eca2 Merge branch 'master_test_gn' into master_prb_gn 2022-05-20 18:39:44 +08:00
duhui 80c5758a64 【寻仙招募调整】回滚 2022-05-20 18:38:12 +08:00
jiahuiwen d319cd953b Merge branch 'master_test_gn' into master_prb_gn 2022-05-20 15:08:52 +08:00
duhui a748d0e64d 【寻仙招募调整】 2022-05-20 14:15:34 +08:00
xuexinpeng 4879ba762e 邮件7日限制 2022-05-25 14:38:22 +08:00
xuexinpeng 2a6dd4dec6 神尊特权 2022-06-09 00:00:49 +08:00
xuexinpeng 3715b8b869 神尊特权 2022-05-24 00:10:32 +08:00
duhui 41b599a9f0 【恢复100档首充奖励】3 2022-05-26 18:16:09 +08:00
duhui 928c266645 【恢复100档首充奖励】2 2022-05-16 17:54:52 +08:00
duhui 726c98f3ab 【恢复100档首充奖励】 2022-05-16 15:23:21 +08:00
duhui 7ed2d5c896 1.添加重载开服时间gm命令功能
2.聊天信息完善
2022-05-10 18:37:06 +08:00
xuexinpeng 9da9ef5bb3 Merge branch 'master_test_gn' into master_prb_gn 2022-05-10 14:10:53 +08:00
xuexinpeng 0e4d5f5558 山河社稷图分页 2022-05-10 13:59:30 +08:00
xuexinpeng 64b06e4c89 山河社稷图分页 新分页新章节 2022-05-10 13:49:09 +08:00
xuexinpeng 357a955689 Merge branch 'master_test_gn' into master_prb_gn 2022-05-09 18:05:02 +08:00
duhui e7659a1b08 爱玩信息上报修改 2022-05-07 13:31:13 +08:00
jiahuiwen c90aeb4c89 宗门排行榜bug 2022-05-06 18:20:35 +08:00
xuexinpeng 0d13709c18 山河社稷图分页 2022-05-05 17:31:42 +08:00
duhui 9c0af37bcf 神印合成bug修改2 2022-04-29 18:05:36 +08:00
duhui 25b4abd436 神印合成bug修改 2022-04-29 15:50:16 +08:00
duhui 5bb162590f 爱玩上报 2022-04-28 17:07:27 +08:00
jiahuiwen 7f7c729752 公会战力排行榜先不跨服 2022-04-28 15:31:35 +08:00
duhui 3ecfc2b88f 助战,神印修改 2022-04-27 16:27:50 +08:00
duhui a614979ef8 Merge remote-tracking branch 'origin/master_test_gn' into master_test_gn 2022-04-27 16:24:38 +08:00
duhui 325bb8b789 助战,神印 2022-04-27 16:24:28 +08:00
xuexinpeng a2b9e1fe5a 跨服身外化身技能 2022-04-29 16:04:13 +08:00
xuexinpeng d589cfc104 化身之力 2022-04-29 15:32:39 +08:00
xuexinpeng 3f138b516f 优化超20回合显示 2022-04-27 15:45:59 +08:00
duhui b97b400182 队伍战力存储到mongo,优化一下 2022-04-26 14:39:31 +08:00
duhui c8e8e644df Merge remote-tracking branch 'origin/master_test_gn' into master_test_gn 2022-04-26 14:20:15 +08:00
duhui 9a8bfa15ed 队伍战力存储到mongo 2022-04-26 14:20:04 +08:00
jiahuiwen 4ebae18d07 优化日志 2022-04-26 14:12:09 +08:00
duhui 4ac1800a01 探索商店解锁问题 2022-04-26 11:03:59 +08:00
xuexinpeng d4fec7f545 变身卡原有逻辑修改 2022-04-26 10:42:03 +08:00
xuexinpeng a62f66c27e 变身卡逻辑修改 2022-04-25 20:23:39 +08:00
DESKTOP-98AVA47\Administrator d4abf2e27e 挑战副本精度 2022-04-27 19:03:20 +08:00
yuanshuai ccbb37e20b Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2022-04-25 18:18:44 +08:00
yuanshuai da68cc9465 开天上报修改 2022-04-25 18:18:35 +08:00
xuexinpeng 0814ed225c 挑战精度问题 2022-04-25 18:12:36 +08:00
jiahuiwen 2518c0821d Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2022-04-25 17:46:05 +08:00
xuexinpeng 4a083edf92 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2022-04-25 17:41:04 +08:00
xuexinpeng e94cef02a9 挑战副本 身外化身之力 2022-04-25 17:39:53 +08:00
duhui cddb0f0935 探索商店解锁问题 2022-04-25 16:48:17 +08:00
jiahuiwen 309ac36c9b 关闭 tapdb 充值上报 2022-04-25 15:40:09 +08:00
jiahuiwen da292b31ab Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2022-04-25 15:36:56 +08:00
jiahuiwen d2a4a19be9 上报bug 2022-04-25 15:36:50 +08:00
jiahuiwen 3dcfb73ec2 开天上报 2022-04-25 15:14:45 +08:00
duhui 6f069c79a9 屏蔽点将台心愿招募,策划表屏蔽,代码先不改了,寻仙招募活动也会用 2022-04-25 11:28:32 +08:00
jiahuiwen abbad4070b 优化代码 2022-04-24 18:12:45 +08:00
xuexinpeng c7715e7a87 身外化身 2022-04-24 18:10:34 +08:00
jiahuiwen eef6b5ca8e 数数上报 改 开天上报 2022-04-24 18:08:08 +08:00
jiahuiwen 9d99aaaee8 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2022-04-24 16:44:57 +08:00
jiahuiwen 7c806e5a27 找回开天上报,注释数数上报 2022-04-24 16:44:51 +08:00
xuexinpeng b3d35a15a3 身外化身 2022-04-24 13:54:31 +08:00
xuexinpeng 28e4676e90 消耗打开 2022-04-22 19:18:02 +08:00
duhui b12d63788b 神印功能提交,补充 2022-04-22 18:27:39 +08:00
duhui 6ce4c11c7d 神印功能提交 2022-04-22 18:27:17 +08:00
xuexinpeng 913af67528 身外化身 2022-04-22 17:26:59 +08:00
jiahuiwen a45d00b522 还原 LogHashMap 2022-04-22 17:25:53 +08:00
xuexinpeng 9a73862291 化身之力 2022-04-22 11:26:52 +08:00
jiahuiwen 94c86cb370 Merge branch 'master_guild_cross' into master_test_gn 2022-04-21 18:36:06 +08:00
jiahuiwen 779647bea4 Merge branch 'master_guild_cross' of http://60.1.1.230/backend/jieling_server into master_guild_cross 2022-04-21 18:35:26 +08:00
jiahuiwen 04d0c57a1a 解散公会bug 2022-04-21 18:35:20 +08:00
xuexinpeng 699836479c 身外化身 2022-04-21 18:08:16 +08:00
jiahuiwen 9a48f5e62f Merge branch 'master_test_gn' into master_guild_cross 2022-04-21 16:55:53 +08:00
DESKTOP-98AVA47\Administrator 2ceaa10726 四灵试炼次数问题 2022-05-30 01:03:23 +08:00
duhui 695de90a50 四灵试炼次数修改 2022-04-21 15:44:54 +08:00
jiahuiwen 1e9dc84c64 车迟斗法退公会 删个人排行榜 2022-04-21 15:31:12 +08:00
jiahuiwen e2974bfc0d 跨服加公会 2022-04-21 14:26:52 +08:00
duhui f86f4e5676 四灵试炼开启天数管理 2022-04-21 14:06:25 +08:00
duhui 232fc4efeb 开服就跨服分组 2022-04-21 13:18:12 +08:00
jiahuiwen 9e754d5a2f 计算车迟挑战人数 2022-04-21 11:41:58 +08:00
duhui 665b993e21 开服就跨服分组 2022-04-21 11:35:05 +08:00
duhui b58df88870 Merge remote-tracking branch 'origin/master_test_gn' into master_test_gn 2022-04-21 11:30:40 +08:00
xuexinpeng 9b38690f93 无尽副本类型变化 2022-04-23 10:34:51 +08:00
xuexinpeng 401889401c 森罗幻境 2022-04-21 18:34:29 +08:00
xuexinpeng b64879f4b2 挑战副本 幻境达人 计数 2022-04-21 17:54:48 +08:00
duhui a4c7a3b74b 屏蔽点将台心愿招募 2022-04-21 11:30:09 +08:00
jiahuiwen 2cfdee74c1 车迟斗法退出公会删排行 2022-04-20 18:06:48 +08:00
xuexinpeng ea6899e50b 挑战副本 2022-04-20 16:24:42 +08:00
jiahuiwen 176d829f61 Merge branch 'master_test_gn' into master_guild_cross 2022-04-20 15:27:39 +08:00
jiahuiwen d32b041372 踢出公会 2022-04-20 14:45:43 +08:00
jiahuiwen 6ebbd502df Merge branch 'master_guild_cross' of http://60.1.1.230/backend/jieling_server into master_guild_cross 2022-04-20 14:44:19 +08:00
jiahuiwen e634933431 踢出公会 2022-04-20 14:44:14 +08:00
jiahuiwen 6d0db1f341 优化跨服公会代码 2022-04-20 14:43:38 +08:00
jiahuiwen d48bd0883e Merge branch 'master_guild_cross' of http://60.1.1.230/backend/jieling_server into master_guild_cross 2022-04-20 13:46:59 +08:00
jiahuiwen f5d18d2575 公会跨服 2022-04-20 13:46:48 +08:00
jiahuiwen c6997d8f1a 干掉 LogHashMap 2022-04-20 13:45:33 +08:00
jiahuiwen f81cfe230d 公会援助 2022-04-20 11:40:17 +08:00
duhui 169d89e47a 关闭紫府神印功能 2022-04-20 11:23:49 +08:00
jiahuiwen 0ec32ba9e6 Merge branch 'master_jhw' of http://60.1.1.230/backend/jieling_server into master_jhw 2022-04-20 10:45:52 +08:00
jiahuiwen 0188b69fb5 注释错误代码 2022-04-20 10:45:38 +08:00
jiahuiwen 676f4c9c17 公会援助 2022-04-20 10:44:01 +08:00
jiahuiwen 24b50bc573 公会公报 2022-04-20 10:39:25 +08:00
jiahuiwen 143a0cd124 公会红包 2022-04-19 17:30:05 +08:00
jiahuiwen 7c2d23e460 公会红包 2022-04-19 17:22:27 +08:00
jiahuiwen 73d3c5c780 公会红包 2022-04-19 17:15:59 +08:00
jiahuiwen 318b1505eb 公会日志 2022-04-19 17:11:20 +08:00
jiahuiwen bdf6666064 跨服公会 2022-04-19 16:05:10 +08:00
xuexinpeng 29dace7812 挑战副本 2022-04-19 15:48:58 +08:00
xuexinpeng 8564d36577 添加战斗结果 2022-04-18 18:19:06 +08:00
xuexinpeng 794fd34895 无尽副本判断输赢 2022-04-18 17:25:08 +08:00
xuexinpeng 9f00eeed00 挑战副本编队类型 2022-04-18 16:49:59 +08:00
jiahuiwen 30175a75c2 跨服加公会 2022-04-18 15:17:35 +08:00
duhui e26b1e18ae 【探索玩法增加探索商店】 2022-04-18 15:05:46 +08:00
jiahuiwen 360e6c846d Revert "跨服加公会"
This reverts commit 122d7836f7.
2022-04-18 09:50:03 +08:00
xuexinpeng 9e3f87cbd0 规范代码 2022-04-15 17:06:03 +08:00
xuexinpeng efc3368d0a 挑战副本 2022-04-15 14:52:04 +08:00
jiahuiwen 122d7836f7 跨服加公会 2022-04-15 10:37:23 +08:00
xuexinpeng a325ba0451 挑战副本 2022-04-14 18:23:30 +08:00
duhui df7006924b 爱玩信息上报 2022-04-12 18:03:13 +08:00
duhui 20f22de280 爱玩信息上报 2022-04-12 17:59:17 +08:00
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