Commit Graph

6474 Commits (85943157a9667fc5760773bf55af72bdc60bbfbe)

Author SHA1 Message Date
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