Commit Graph

7116 Commits (c5cf5cc1424c49605f8db698bfe68b155e237c48)

Author SHA1 Message Date
duhui 2cf97cce54 神将置换 2023-02-16 16:31:44 +08:00
duhui 99779a39e1 神将置换 2023-02-16 14:51:00 +08:00
duhui 2ebfee79bd 完善法相逻辑 2023-02-16 14:49:55 +08:00
duhui 071219b068 商店存库逻辑优化 2023-02-16 13:58:35 +08:00
duhui 7d947c5b78 法相逻辑优化 2023-02-16 13:49:49 +08:00
duhui d94b80840e 法相第2版补充 2023-02-16 11:40:47 +08:00
duhui 48205642e4 法相第一版 2023-02-15 19:06:23 +08:00
duhui cf05efb0da 临时 2023-02-15 19:01:56 +08:00
duhui e98d7b482b 玩家离线时间存redis 2023-02-15 19:00:41 +08:00
duhui 4692f2804a 修改离线满10分钟清理玩家缓存 2023-02-15 16:58:55 +08:00
duhui 860a126523 排行榜分数修正 2023-02-15 11:03:07 +08:00
duhui d516374225 灵脉 2023-02-14 18:02:56 +08:00
duhui a1e2bffd8b 返利error优化 2023-02-13 17:43:53 +08:00
duhui a1fc1e1683 Merge branch 'dev_dh_bt' into dev_bt
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_general.java
2023-02-13 15:14:05 +08:00
duhui 08042195cb gm删除道具 2023-02-10 18:42:37 +08:00
duhui 3d1681bfad gm删除道具 2023-02-10 18:34:48 +08:00
duhui 81e72ba228 gm 2023-02-10 17:57:45 +08:00
duhui 7cda848b0b gm 2023-02-10 17:19:48 +08:00
duhui 8ee880c58e 日志 2023-02-27 17:38:31 +08:00
duhui 2e407ffd92 日志 2023-02-27 17:08:47 +08:00
duhui 94f406f940 修改返利跨天重置 2023-02-09 21:35:28 +08:00
duhui 80b7cfa464 日志 2023-02-09 21:04:50 +08:00
duhui 806dd0d333 日志 2023-02-09 20:51:23 +08:00
duhui 067af5d9f4 linshi 2023-02-09 20:50:26 +08:00
duhui 187b429661 修改邮件上限 2023-02-09 15:50:06 +08:00
duhui 95a7801138 删除邮件 2023-02-08 20:28:14 +08:00
duhui 44eae0f96f gm返利补充5 2023-02-08 17:56:49 +08:00
duhui c27a46f082 gm返利补充3:时间 2023-02-08 17:43:47 +08:00
duhui 118cc3341a gm返利补充2 2023-02-08 17:39:18 +08:00
duhui 6c1d201f87 gm返利补充 2023-02-08 16:34:05 +08:00
duhui 28d8564f2b 寻宝活动补偿 2023-02-08 16:04:25 +08:00
duhui 80b61b2fb1 关卡验证 2023-02-08 15:17:49 +08:00
duhui 063674c2f2 线下返利补偿 2023-02-08 14:24:54 +08:00
duhui 3844c8e4b2 优化第一期 2023-02-07 17:24:20 +08:00
duhui 0b1155bf3f 优化第一期 2023-02-07 17:06:59 +08:00
duhui 2f8b8d4c2a 线上问题处理,1;部分活动充值,2:玉虚挑战处理 2023-02-19 16:29:12 +08:00
duhui 0ae2a25d23 自动返利互动零点刷新逻辑优化 2023-02-07 11:14:19 +08:00
duhui a2f605cca6 罗浮争锋匹配逻辑修改 2023-02-03 14:45:34 +08:00
duhui e7e0ce8eb8 战斗记录逻辑优化,但是未启用(可能会增加io和内存) 2023-02-02 15:30:34 +08:00
duhui a32bec7c08 战斗记录逻辑优化,但是未启用(可能会增加io和内存) 2023-02-02 15:21:37 +08:00
duhui be12e006a2 挖宝重置优化2 2023-02-02 10:19:12 +08:00
duhui 2bc03ed615 挖宝重置优化 2023-02-02 10:03:58 +08:00
duhui 8c8f58bee5 不涉及逻辑 2023-02-01 20:14:20 +08:00
duhui 2c1229b570 挖宝优化2 2023-02-01 18:10:08 +08:00
duhui 5dd4da7c94 挖宝优化 2023-02-01 17:37:50 +08:00
duhui de9677c67f 仙充卡线下返利3 2023-02-01 15:56:16 +08:00
duhui f14552a205 仙充卡线下返利2 2023-02-01 14:58:56 +08:00
duhui 1cdb30a18e 仙充卡线下返利 2023-02-01 14:18:07 +08:00
duhui 5745c2f764 车迟斗法排行榜日志 2023-02-01 11:51:05 +08:00
duhui 06fdd175e4 仙充记录线下返利 2023-02-02 03:47:14 +08:00
duhui 48f71e6b21 补充 2023-01-29 21:34:03 +08:00
duhui 594497fb53 回滚 2023-01-29 21:31:01 +08:00
duhui 30d1360629 返利日志 2023-01-29 20:42:33 +08:00
duhui 1aff9c7871 不允许线上使用test支付 2023-01-29 19:02:54 +08:00
duhui 9bd38782f0 日志 2023-01-28 15:49:38 +08:00
duhui 7f56dc9579 热更bug修复5 2023-01-28 13:40:26 +08:00
duhui 67817fa162 热更bug修复4 2023-01-28 13:29:57 +08:00
duhui 5151dc65af 热更bug修复3 2023-01-27 23:38:40 +08:00
duhui b996736cd8 热更bug修复2 2023-01-27 23:25:51 +08:00
duhui 27380b64f3 热更bug修复 2023-01-27 17:51:50 +08:00
duhui bca7dc18de 热更bug修复 2023-01-27 17:37:29 +08:00
duhui ba78a6c201 热更bug修复 2023-01-27 00:06:48 +08:00
duhui dc11a8943e 神尊等级初始化问题 2023-01-26 15:16:16 +08:00
duhui c1fddebb22 转盘修复问题 2023-01-25 10:21:30 +08:00
duhui 6bf86f81b0 取消汇率同步 2023-01-24 20:29:06 +08:00
duhui d8f8d74576 特权异常处理 2023-01-24 18:59:59 +08:00
duhui e26f5536a5 05 2023-01-24 14:10:40 +08:00
duhui 04c226bd07 04 2023-01-24 13:43:03 +08:00
duhui 24d40b5078 03 2023-01-24 10:42:56 +08:00
duhui 0c51449a16 02 2023-01-24 10:26:15 +08:00
duhui f32826aa3e 01 2023-01-24 08:25:34 +08:00
duhui 9c4b21e7ef 策划需求:罗浮争锋去除挑战限制 2023-01-21 11:27:11 +08:00
duhui 3ed9406b49 策划需求:车迟斗法功能修改 2023-01-13 10:58:23 +08:00
duhui ab293afbb2 策划需求:轩辕宝镜屏蔽排行和排行奖励 2023-01-10 15:23:37 +08:00
duhui c47d214052 修改线下妖精返利额度逻辑 2023-01-10 11:13:51 +08:00
duhui f1e45eaa70 maven镜像 2023-01-09 16:02:39 +08:00
duhui 6cbaf38541 达人功能去除排行榜和奖励邮件 2023-01-16 15:30:10 +08:00
duhui 9e636e277b 1. 线下妖晶返利活动bug修复
2. 邮件支持long数量道具
2023-01-09 15:22:55 +08:00
duhui c041d3dcdf 屏蔽修改 2023-01-06 17:35:37 +08:00
duhui 97edfd2e2a 灵宝空值校验 2023-01-06 16:11:27 +08:00
duhui 54315803ca 线下返利,单日累充活动重置 2023-01-06 11:34:46 +08:00
duhui 6797841d24 线下返利 2023-01-05 16:42:46 +08:00
duhui 2147648dd5 报错处理 2023-01-04 15:27:01 +08:00
duhui a970c208dc 去除每日零点清空道具逻辑 2023-01-03 17:17:52 +08:00
duhui 4e957f7932 活动礼包开启条件修改 2022-12-27 17:36:55 +08:00
duhui 6048b49a87 伤害副本优化 2022-12-24 18:05:58 +08:00
duhui 5f83cc7f81 鸿蒙阵修改 2022-12-23 14:47:38 +08:00
duhui 7d69dcabb4 伤害副本bug修复 2022-12-22 11:59:21 +08:00
duhui 3b14b8db9a 抽奖消耗顺序 2022-12-08 15:05:15 +08:00
duhui 454ed89679 使用道具累充 2022-12-19 18:37:29 +08:00
duhui 9c794b1173 送十万真充活动bug1 2022-12-15 16:22:32 +08:00
duhui d705028181 送十万真充活动 2022-12-14 17:08:55 +08:00
duhui 795ea6810a 热榜点赞bug修改3 2022-12-12 17:29:23 +08:00
duhui f59f042aa8 热榜点赞bug修改2 2022-12-12 17:18:45 +08:00
duhui 514e19b210 热榜点赞bug修改 2022-12-12 16:29:33 +08:00
duhui ce9d4f5b27 热榜点赞 2022-12-12 14:16:45 +08:00
duhui 5861711eaa 妖晶累充活动优化 2022-12-09 15:31:39 +08:00
duhui e8c70027a9 合并代码丢失修复 2022-12-09 12:00:59 +08:00
duhui 18e1310543 调试代码关闭 2022-12-09 11:59:55 +08:00
duhui 475ffca53d 热榜代码合并2 2022-12-09 11:31:06 +08:00
duhui 7e7c7c36ca 合并代码1 2022-12-09 11:27:02 +08:00
duhui 2aa1651e99 需求:gm可查询最早晋升神尊11、12级得三人 2022-12-08 16:33:13 +08:00
duhui ddf90096dc 完善线下返利活动 2022-12-08 12:37:56 +08:00
duhui c6cb0c2bff 修改gm线下返利活动 2022-12-08 11:56:07 +08:00
duhui 3463c2052b 妖晶累充活动和仙晶累充活动,补充 2022-12-08 17:33:12 +08:00
duhui 31e496e566 妖晶累充活动和仙晶累充活动 2022-12-08 17:27:18 +08:00
duhui b24ba14a0b 解决扫荡奖励爆表问题 2022-12-08 15:23:30 +08:00
duhui 4e6bc9f165 解决挑战副本奖励问题 2022-12-02 11:07:15 +08:00
duhui 7988bad68e 购买额外获得2 2022-11-30 13:51:51 +08:00
duhui 651e50b89c 购买额外获得 2022-11-29 17:34:02 +08:00
duhui e0c18ffa8e 购买额外获得 2022-11-29 16:32:16 +08:00
duhui 7398f86250 送10万抽优化4 2022-12-01 11:01:06 +08:00
duhui 2f5929a5dc 送10万抽优化3 2022-11-28 15:54:07 +08:00
duhui add76839d0 送10万抽优化2 2022-11-28 11:20:23 +08:00
duhui 06fe3e42f5 送10万抽优化 2022-11-28 11:18:14 +08:00
duhui 7ed038d124 好感度技能 2022-11-23 13:35:54 +08:00
duhui 6d87330796 无用代码删除 2022-11-22 11:08:24 +08:00
duhui 74e392be4d 功能开启问题修改 2022-11-22 10:59:15 +08:00
duhui 47e195c76a 聊天修改 2022-11-22 10:36:46 +08:00
duhui c3fe0ac2c8 功能表结构修改兼容 2022-11-21 16:04:36 +08:00
duhui af9dfd344a 仙充卡不再每日清零 2022-11-21 09:43:16 +08:00
duhui 8bec8568f2 1、聊天添加限制条件
2、礼包表结构修改
2022-11-18 18:01:49 +08:00
duhui 1b0bfdd9be 神印套装技能完善 2022-11-18 17:08:04 +08:00
duhui fd21726937 送十万真充活动初版 2022-11-18 15:09:30 +08:00
duhui 04197abb0c 技能bug修改 2022-11-18 10:06:54 +08:00
duhui 951f74cafb 好感度提升修改 2022-11-17 17:16:13 +08:00
duhui 9610d134d3 购买礼包额外掉落 2022-11-17 16:59:11 +08:00
duhui f4952c5d51 1、添加神印套装技能
2、添加魂灵宝精炼技能
2022-11-17 16:54:28 +08:00
duhui 4a030074ea 月卡问题 2022-11-17 16:11:46 +08:00
duhui fb0061f391 开服冲榜,邮件内容 2022-11-17 14:26:39 +08:00
duhui 0090f15645 开服冲榜,分数问题 2022-11-17 14:02:17 +08:00
duhui 16749cae35 战力排行榜逻辑优化 2022-11-15 15:46:40 +08:00
duhui 445da5f7c0 冲榜发邮件内容优化 2022-11-19 11:42:58 +08:00
duhui 7b1ff178d8 冲榜发邮件 2022-11-17 11:13:00 +08:00
duhui 03d353ffdc 冲榜邮件 2022-11-15 10:59:37 +08:00
duhui 8d7e3dd4ed 伤害副本逻辑优化 2022-11-14 15:50:52 +08:00
duhui d331fd5410 开服冲榜活动,魂印榜邮件 2022-11-14 15:50:16 +08:00
duhui e051206610 开服冲榜活动,战力榜问题 2022-11-14 09:41:01 +08:00
duhui 4bdb6ca592 开服冲榜活动,发奖逻辑2 2022-11-11 17:19:22 +08:00
duhui 2a5889e939 开服冲榜活动,发奖逻辑 2022-11-14 00:44:34 +08:00
duhui ee6653d58f 零点清理道具 2022-11-13 00:04:08 +08:00
duhui 3aad1ca72e 伤害副本修改 2022-11-11 15:39:48 +08:00
duhui 6fd68e9a00 冲榜活动修改 2022-11-11 15:33:02 +08:00
duhui 09c67a2ed1 战力排行榜排序修正 2022-11-11 13:43:58 +08:00
duhui 7e7b8a43a3 补漏 2022-11-11 13:40:27 +08:00
duhui ff090866d4 零点清理道具添加前端推送协议 2022-11-11 10:56:32 +08:00
duhui 998ab5ce14 开服冲榜活动,单个排行榜结束保存数据 2022-11-10 17:11:50 +08:00
duhui fce4cfe8c6 开服冲榜活动,结束状态修改 2022-11-10 15:19:32 +08:00
duhui 3f4ad6acde 开服冲榜活动,时间修正 2022-11-10 14:47:18 +08:00
duhui 0f18feb57b 开服冲榜活动,排行榜计算 2022-11-10 14:19:34 +08:00
duhui 3ab98dced8 开服冲榜活动,英雄星级计算触发位置增加 2022-11-10 10:39:52 +08:00
duhui 58dd7cace5 超值返利bug修复 2022-11-12 17:29:50 +08:00
duhui 1e3f97eb39 添加验证 2022-11-09 17:17:30 +08:00
duhui a2378730d3 特权 2022-11-09 16:07:04 +08:00
duhui df8d2dafcb 现金卡计入累充4 2022-11-08 15:22:07 +08:00
duhui b24e187723 现金卡计入累充3 2022-11-08 15:16:41 +08:00
duhui e0a494c1c2 现金卡计入累充2 2022-11-08 15:04:58 +08:00
duhui 711778ec98 现金卡计入累充 2022-11-08 14:12:46 +08:00
duhui 8c10cde626 自动返利 2022-11-08 13:45:30 +08:00
duhui b5323a534e 超值返利活动 2022-11-12 17:11:35 +08:00
duhui ef14f61e68 开服冲榜活动 2022-11-12 17:07:05 +08:00
duhui ef5c32772d 红包最大金额 2022-11-07 15:16:20 +08:00
duhui 204c2f4a82 挂机奖励,随机奖励获得特权加成 2022-11-07 14:30:21 +08:00
duhui 60f3397865 开服冲榜活动结束 2022-11-07 14:12:03 +08:00
duhui d112e60d82 特权影响直冲卡红包掉落2 2022-11-07 13:39:44 +08:00
duhui cb4b6d1bd1 特权影响直冲卡红包掉落 2022-11-07 11:50:39 +08:00
duhui e60184b0c3 线下自动返利优化完善 2022-11-04 18:00:05 +08:00
duhui 861a89cc42 特权加成主线挑战奖励 2022-11-04 17:58:00 +08:00
duhui e7c9be735a 刷冲修改 2022-11-04 16:51:15 +08:00
duhui b45efced66 gm修改器购买礼包验证流程优化修改 2022-11-04 16:29:52 +08:00
duhui 6b72172fe8 gm修改器购买,老活动修改,自动返利监听器修改 2022-11-04 15:35:01 +08:00
duhui a520fb0a75 代码修正 2022-11-03 17:56:57 +08:00
duhui 23c4427207 自动返利 2022-11-03 16:47:42 +08:00
duhui f690ffa1ee 小问题修改 2022-11-03 14:57:01 +08:00
duhui fbba7b5300 小问题 2022-11-02 15:12:51 +08:00
duhui 697b531f1a 修改提示 2022-11-02 10:17:36 +08:00
duhui 753e693fed 1.变身卡升星修改
2.bug处理
2022-11-01 17:06:06 +08:00
duhui 8f602dfebe gm充值返利活动 2022-11-01 11:17:31 +08:00
duhui ffc965a6fe 开服冲榜补充 2022-11-02 18:20:03 +08:00
duhui dc8e3b3c3c 1、gm转盘抽中稀有清空累计次数
2、冲榜活动英雄星级计算加上品质
2022-10-28 18:21:15 +08:00
duhui e1d8422416 gm转盘优化3:累计抽卡次数推送 2022-10-28 18:04:08 +08:00
duhui 9c459dc23d gm转盘优化2:特权相关内容 2022-10-27 10:00:08 +08:00
duhui 731bcc0292 空指针处理 2022-10-21 17:04:24 +08:00
duhui 7591ced69e 道具日志重复问题提交 2022-10-20 16:56:04 +08:00
duhui 453584cea0 线程池方法添加 2022-10-20 16:37:16 +08:00
duhui 9f042f4030 开服冲榜活动 2022-10-20 16:28:11 +08:00
duhui 705429e09e Merge branch 'master_test_gn' into dev_dh_bt 2022-10-20 13:59:06 +08:00
duhui c2940417ad redisutil加异常捕捉和日志 2022-10-20 10:34:21 +08:00
duhui 13c77c0830 变身卡修改开启等级 2022-10-18 17:07:00 +08:00
duhui a2641a596a 变身卡增加星级 2022-10-18 16:09:32 +08:00
duhui de7600323e 送无限抽活动优化 2022-10-19 17:20:47 +08:00
duhui c4a00a45a4 首充活动优化 2022-10-16 10:37:06 +08:00
duhui 333faebe9c 首充活动bug修改,部分代码修改注释 2022-10-12 16:50:59 +08:00
duhui 36401ce309 新增道具类型 2022-09-28 16:54:20 +08:00
duhui b0595988ad 小优化 2022-09-27 18:06:43 +08:00
duhui 7dbbb96c79 免费充值活动 2022-09-27 16:48:37 +08:00
duhui f723ae905c 刷冲特权问题修改2 2022-09-22 18:13:30 +08:00
duhui 5aef7674e7 刷冲特权问题修改 2022-09-22 18:04:43 +08:00
duhui b39221e45f gm修改器购买 2022-09-20 14:48:31 +08:00
duhui 3881e066ed 直购首冲活动 2022-09-19 16:32:55 +08:00
duhui d9c771e49b 全民福利,单个服务器生效 2022-09-19 14:48:50 +08:00
duhui 56e993f2a9 人民币购买时获得名望及仙晶 2022-09-16 14:33:49 +08:00
duhui 6f88779303 特权修复 2022-09-16 11:18:00 +08:00
duhui 286d9a3f34 特权修复 2022-09-16 10:44:17 +08:00
duhui caee7ba2a1 特权创角初始化 2022-09-16 10:00:08 +08:00
duhui 3a32b7889d 御兽特权 2022-09-15 18:10:39 +08:00
duhui 8ecab4414a 小bug修改 2022-09-15 17:53:41 +08:00
duhui 8d786bb5e1 全民福利活动修改 2022-09-15 15:46:57 +08:00
duhui 05243c0cb9 活动修改,全民福利和gm转盘 2022-09-15 14:43:55 +08:00
duhui 5bb9388894 小修改 2022-09-14 16:37:19 +08:00
duhui 31a2d5b56a 代码合并 2022-09-14 16:07:07 +08:00
duhui ad7a3184e3 bt版本2.0,gm修改器逻辑 2022-09-14 16:01:44 +08:00
duhui 78e653ab65 补充2 2022-09-09 19:36:47 +08:00
duhui b108f8abc9 补充2 2022-09-09 19:33:49 +08:00
duhui 584d727dee 补充2 2022-09-09 19:29:43 +08:00
duhui 19573065db 补充2 2022-09-09 18:41:42 +08:00
duhui 62151df478 补充 2022-09-09 18:39:43 +08:00
duhui 5778fe091c 特权经验 2022-09-09 18:18:29 +08:00
duhui 9e6c8637da 活动时间修改 2022-09-09 18:03:57 +08:00
duhui 3f66ac83b5 商店购买提示修改 2022-09-09 17:09:14 +08:00
duhui 85943157a9 刷冲特权活动补充 2022-09-09 15:39:58 +08:00
duhui fad92b7455 刷冲特权活动,无限资源阁活动,每日道具清理 2022-09-09 15:38:17 +08:00
duhui 8c86bb20f7 bt:新增特权 2022-09-08 15:40:52 +08:00
duhui 73a0b91d3e 送无限抽活动 2022-09-07 16:05:52 +08:00
duhui e89efa1a76 Merge remote-tracking branch 'origin/master_test_gn' into master_test_gn 2022-09-07 15:06:11 +08:00
duhui 5cf5552eb8 神应最大等级 2022-09-07 15:06:04 +08:00
duhui 5aee8e8d6b bt特权 2022-09-07 14:52:05 +08:00
dengdan 16d9af5e3f Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2022-09-07 14:24:40 +08:00
dengdan f2ace7c526 修复玉虚跨服带灵兽的问题 2022-09-07 14:24:14 +08:00
dengdan c10d1193a4 修复玉虚跨服战斗有灵兽的问题 2022-09-14 11:23:52 +08:00
dengdan 26cc5f0ce1 修复查看罗浮,灵脉等信息为玉虚信息的问题 2022-09-14 11:20:21 +08:00
duhui 6ee2ba5d88 变身卡消耗bug 2022-09-07 14:04:03 +08:00
duhui cb2581e5fc 任务兼容 2022-09-07 13:48:21 +08:00
duhui 43b3eaca7f Merge remote-tracking branch 'origin/master_test_gn' into master_test_gn 2022-09-07 13:32:27 +08:00
duhui c1f8088349 跨服用户属性 2022-09-07 13:31:57 +08:00
duhui add9233993 全民福利 2022-09-07 10:36:57 +08:00
duhui 1355645444 宝器bug 2022-09-06 18:27:59 +08:00
duhui 7de75cd738 宝器gm 2022-09-06 17:04:57 +08:00
duhui fa8b30a0ad 本地忽略敏感字服务器 2022-09-06 16:56:11 +08:00
duhui c24fe5768c 宝器合成返回道具,修改 2022-09-06 16:19:56 +08:00
duhui 2df133f4d2 太初特权和刷冲特权用到的特权覆盖 2022-09-06 16:07:21 +08:00
duhui 6a3ef86f79 宝器合成返回道具 2022-09-06 15:30:47 +08:00
duhui 3284203069 牛气冲天活动bug修改,补充 2022-09-06 13:54:57 +08:00
duhui bfdd43d6bd 牛气冲天活动bug修改 2022-09-06 13:45:24 +08:00
duhui 0579b663eb Merge branch 'master_prb_gn' into master_test_gn 2022-09-06 13:30:11 +08:00
duhui d92882cb02 Merge branch 'dev_equip' into master_test_gn 2022-09-06 13:28:53 +08:00
duhui 7f1866406f 建木神树 2022-09-05 15:45:22 +08:00
duhui 6e81f56b7a 跨服展示英雄报错 2022-09-05 13:30:50 +08:00
duhui fabf55e0dc Merge remote-tracking branch 'origin/master_test_gn' into master_test_gn 2022-09-02 13:46:40 +08:00
dengdan 1599f15eae 调整玉虚论道 2022-09-13 12:26:24 +08:00
dengdan abf3c59199 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2022-09-13 12:20:17 +08:00
dengdan b1e721c96a 调整玉虚论道 2022-09-13 12:19:48 +08:00
dengdan 1a7f39304c 玉虚论道调整为半公平 2022-09-12 11:56:57 +08:00
dengdan 8e93d63e25 玉虚论道玩法调整为半公平竞技 2022-09-12 11:04:11 +08:00
duhui 8bf8d3c9e6 摘星阁,装备重置 2022-09-02 13:46:26 +08:00
duhui fc2eb578d5 冲突解决 2022-09-01 17:16:41 +08:00
duhui 76674db4d5 Merge branch 'dev_equip' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/player/ViewHeroInfoHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2022-09-01 17:13:34 +08:00
duhui cf6b898585 摘星阁装备强化 2022-09-01 17:08:02 +08:00
DESKTOP-98AVA47\Administrator 67c4ecd512 法宝邮件 2022-08-31 22:36:07 +08:00
duhui e032f25e43 摘星阁装备强化 2022-08-31 15:19:47 +08:00
duhui dd541be780 摘星阁装备强化 2022-08-31 15:18:17 +08:00
duhui 609bdac818 Merge branch 'master_test_gn' into dev_equip
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
2022-08-30 16:53:03 +08:00
duhui 23e632dd30 法宝等级上限 2022-08-30 15:59:09 +08:00
duhui a1fcc56f01 灵兽宝阁活动回滚 2022-08-30 11:53:16 +08:00
duhui e1e551f1f1 灵兽宝阁活动冲突 2022-08-29 23:09:58 +08:00
duhui a0050f326b 敏感字检测服未开启默认通过检测,兼容本地测试 2022-08-29 14:25:01 +08:00
duhui 2a51cb6da7 变身卡问题处理 2022-08-26 13:36:42 +08:00
duhui 42b38b25a5 玩家起名问题 2022-08-29 21:43:05 +08:00
duhui f6267ce855 玩家发言问题 2022-08-27 13:52:19 +08:00
duhui f4d4134e69 森罗扫荡,杀敌数问题 2022-08-27 13:26:11 +08:00
duhui 258d1e88ce 代码可读性修改 2022-08-24 09:57:06 +08:00
DESKTOP-98AVA47\Administrator aace2dae75 车迟斗法时间 2022-09-26 15:30:48 +08:00
duhui 4e10dbdae7 车迟斗法挑战记录改为一天的 2022-08-23 17:28:00 +08:00
duhui b0114b8d4c 森罗幻境扫荡,boss杀敌数 2022-08-22 17:43:15 +08:00
duhui 844b0114cd 摘星阁装备调整初版,未联调 2022-08-19 18:12:57 +08:00
duhui 8508c685db 身外化身限制添加 2022-08-18 17:13:35 +08:00
duhui 4c9c1e1841 森罗幻境完成初版2 2022-08-18 16:16:00 +08:00
duhui dcc9f3331d 森罗幻境完成初版 2022-08-18 16:02:48 +08:00
duhui 402efe553c 森罗幻境未完成 2022-08-17 18:09:45 +08:00
duhui 19ac577d2f 新活动,寻仙商城 2022-08-17 17:37:33 +08:00
duhui 3df83ecad7 逍遥游修改 2022-08-16 14:59:43 +08:00
duhui ed2bdf5e6d 逍遥游修改 2022-08-16 11:57:52 +08:00
duhui 4d3d9abf1e 逍遥游修改 2022-08-15 13:55:17 +08:00
DESKTOP-98AVA47\Administrator 5073642868 摘星阁重置邮件 2022-08-15 01:53:48 +08:00
duhui 8f17bdc655 好感度代码优化 2022-08-12 16:51:23 +08:00
duhui e7751a8e0e 好感度同步问题 2022-08-12 16:41:38 +08:00
duhui ed2ccd969b 装备碎片道具添加 2022-08-11 11:30:53 +08:00
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