Commit Graph

6729 Commits (ac75bdc9e9227017be8eb3c78500cc8c51cca3d1)

Author SHA1 Message Date
duhui 3fc272cb1f 法宝分解 2022-08-10 15:27:32 +08:00
duhui b42511aade 法宝道具 2022-08-10 10:17:50 +08:00
duhui a3cede0bb8 好感度碎片道具提交 2022-08-09 16:44:14 +08:00
duhui 0138170505 【摘星阁重构】增加道具消耗种类 2022-08-08 14:34:13 +08:00
duhui bb16d01442 热度排行榜 2022-08-04 16:42:32 +08:00
duhui b085fc0b2b 车迟斗法积分添加日志 2022-07-20 15:56:32 +08:00
DESKTOP-98AVA47\Administrator ecf41ec2b3 心愿抽卡,未选择心愿报错兼容,直接返回原本英雄 2022-07-29 22:38:34 +08:00
duhui ae47b63edd Merge branch 'master_test_gn' into master_prb_gn 2022-07-13 19:44:08 +08:00
duhui 1e65d0fe7b 跨服分组逻辑优化 2022-07-13 19:43:46 +08:00
duhui 180120f93c 跨服分组逻辑优化 2022-07-13 16:45:38 +08:00
duhui c41de97b94 跨服排行榜空数据处理 2022-07-13 15:37:45 +08:00
duhui 9f98449474 比数字小游戏gm,注释 2022-07-12 13:55:47 +08:00
duhui 12080ac558 比数字小游戏gm 2022-07-12 13:55:01 +08:00
duhui 13e7fcc48a 修改获取随机名称通过敏感字服时,如果链接失败,直接抛出异常,而不是不断重复(容易导致死循环) 2022-07-11 17:54:40 +08:00
duhui f3ecd4fc3f 比数小游戏 2022-07-11 15:45:42 +08:00
duhui b89c65056f 【任务类型补充】添加触发操作 2022-07-08 17:51:45 +08:00
duhui bac38e2d33 【任务类型补充】6个 159-164,触发操作未加 2022-07-08 14:06:54 +08:00
duhui fc19c03886 钻石心愿抽卡修改必中次数 2022-07-07 15:23:23 +08:00
duhui bc1fb4b47f Merge branch 'master_test_gn' into master_prb_gn 2022-07-06 14:13:52 +08:00
duhui 959d669813 缥缈之旅的奖励改为双月卡专享 2022-07-04 16:39:24 +08:00
jiahuiwen f7803f53de 公会援助不刷新bug 2022-06-23 14:08:35 +08:00
DESKTOP-98AVA47\Administrator 27bcc3ef26 功能开启 2022-06-22 14:19:14 +08:00
jiahuiwen 051df7188a Merge branch 'master_test_gn' into master_prb_gn 2022-06-21 14:24:07 +08:00
duhui c898e80cd0 Merge branch 'master_test_gn' into master_prb_gn 2022-06-21 11:32:23 +08:00
duhui 3b3fe2878f 【易经宝库增加一键挖宝】 2022-06-20 14:21:28 +08:00
duhui 8848cadbd5 英雄初始被动 2022-06-15 10:57:27 +08:00
duhui a7cda77d55 周卡月卡调整 2022-07-12 14:21:17 +08:00
duhui 1db35a294f Merge branch 'master_test_gn' into master_prb_gn 2022-07-12 12:13:51 +08:00
duhui 429a771b77 周卡优化 2022-07-12 12:00:49 +08:00
duhui 58d7dc27c6 周卡优化 2022-06-19 19:58:58 +08:00
duhui 3261813450 周卡月卡调整,兼容老版本3 2023-07-18 19:53:14 +08:00
jiahuiwen b6c4f3814c 升级fastjson,修复Fastjson 反序列化任意代码执行漏洞风险 2022-06-15 09:38:08 +08:00
duhui 43873b23eb 周卡月卡调整,兼容老版本2 2022-06-10 19:06:38 +08:00
duhui f8e2852405 周卡月卡调整,兼容老版本 2022-06-17 12:40:46 +08:00
duhui b0f6149358 周卡月卡调整,兼容老版本 2022-06-17 12:31:54 +08:00
duhui be1ea53244 周卡月卡调整,兼容老版本月卡,四版 2022-06-17 11:37:35 +08:00
duhui 8c928fd864 周卡月卡调整,兼容老版本月卡,四版 2022-06-17 11:25:19 +08:00
duhui 5f6e0ff20a 周卡月卡调整,兼容老版本月卡,四版 2022-06-17 11:08:07 +08:00
duhui 92a63c75e3 周卡月卡调整,改时间bug,三版 2022-06-16 15:40:32 +08:00
duhui cd3dba3982 周卡月卡调整改bug,二版 2022-06-17 15:40:56 +08:00
jiahuiwen c00597d908 Merge branch 'master_test_gn' into master_prb_gn 2022-06-09 13:37:10 +08:00
duhui 9f01f3c35f 周卡月卡调整完成,初版 2022-06-08 18:58:38 +08:00
duhui 651d94e41b 周卡月卡调整,修改,未完成 2022-06-08 18:10:47 +08:00
duhui 6f63f03ab0 月卡调整,暂存 2022-06-06 16:31:44 +08:00
yuanshuai ea547c2dc1 英雄升星活动报错修改 2022-06-01 17:51:16 +08:00
duhui bd48f7bc3d 新周卡功能,bug修改-天数问题+1 2022-06-01 11:16:03 +08:00
duhui 1ec28cdf76 新周卡功能,bug修改-发邮件 2022-06-08 19:06:48 +08:00
duhui 27f92a9de8 新周卡功能,bug修改1 2022-06-04 00:02:27 +08:00
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
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