Commit Graph

6908 Commits (42e79a2546f882134bba44f6919f4810f1b95260)

Author SHA1 Message Date
PC-202302260912\Administrator d88201a933 Merge branch 'master_huanxiang' into master_ob2
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java
2023-07-19 15:27:49 +08:00
PC-202302260912\Administrator c49ae44705 抽卡显示 2023-07-19 15:26:04 +08:00
PC-202302260912\Administrator 66f04a7b46 心愿 2023-07-21 18:46:38 +08:00
PC-202302260912\Administrator 8a729c7c22 Merge remote-tracking branch 'origin/master_huanxiang' into master_huanxiang 2023-07-21 17:55:19 +08:00
PC-202302260912\Administrator 78142836f2 心愿 2023-07-21 17:54:58 +08:00
PC-202302260912\Administrator 3aab5ee062 推送礼包修改 2023-07-18 15:49:16 +08:00
PC-202302260912\Administrator 934b85dcd4 大闹天宫初版 2023-07-18 15:32:35 +08:00
PC-202302260912\Administrator 67fa585f18 推送礼包修改 2023-07-18 15:13:18 +08:00
PC-202302260912\Administrator bd0217e13b 心愿 2023-07-14 15:40:07 +08:00
PC-202302260912\Administrator 5bf9973b86 玲珑宝镜任务 2023-07-13 14:57:50 +08:00
PC-202302260912\Administrator cb55e2af1f 青龙秘宝 2023-07-13 14:51:54 +08:00
PC-202302260912\Administrator 497060fbd9 青龙秘宝修改 2023-07-13 14:31:37 +08:00
PC-202302260912\Administrator 6a6e36facc 青龙秘宝修改 2023-07-13 10:30:37 +08:00
PC-202302260912\Administrator 64105348b4 青龙回滚 2023-07-12 16:27:55 +08:00
PC-202302260912\Administrator 68726ee38d 逻辑优化 2023-07-10 16:16:54 +08:00
xuexinpeng f88b520d0f 新增一直开活动类型6 - 青龙秘宝 2023-07-07 13:47:56 +08:00
PC-202302260912\Administrator 303f32e25c 关闭逐胜之巅 2023-07-06 18:05:16 +08:00
PC-202302260912\Administrator c381a9cf58 自动战斗 2023-07-06 16:02:15 +08:00
PC-202302260912\Administrator 8bc2e97047 七界取消排行榜奖励 2023-07-06 14:15:38 +08:00
PC-202302260912\Administrator d76438ab99 商店修改 2023-07-04 17:10:02 +08:00
PC-202302260912\Administrator 97080e3da5 优化 2023-07-04 14:20:09 +08:00
PC-202302260912\Administrator fb2d6919b5 专属商城 2023-06-30 19:01:29 +08:00
PC-202302260912\Administrator c5cd4fb8bd 天降礼包补充 2023-06-28 18:54:30 +08:00
PC-202302260912\Administrator 99a484ba83 刷冲特权和太初特权修改 2023-06-28 16:42:45 +08:00
PC-202302260912\Administrator 9baf7f486e 代金卷购买 2023-06-28 14:41:24 +08:00
PC-202302260912\Administrator ecafe44bfb 天降礼包初版 2023-06-30 13:16:42 +08:00
PC-202302260912\Administrator 3bbafe19c4 天降礼包初版 2023-06-26 19:03:25 +08:00
PC-202302260912\Administrator 9f1150aa0c 礼包逻辑整体修改 2023-06-25 18:20:02 +08:00
PC-202302260912\Administrator fb0cee1d06 战斗同步 2023-06-25 18:18:32 +08:00
PC-202302260912\Administrator fc5cba8376 礼包初该 2023-06-16 13:59:34 +08:00
PC-202302260912\Administrator 615fd8df01 心愿修改 2023-06-14 11:18:29 +08:00
duhui 41012e5528 心愿活动 2023-06-06 10:30:25 +08:00
duhui a14a867b48 月卡 2023-06-02 17:09:14 +08:00
duhui 5a35fe0fd1 主角技能 2023-05-31 18:04:06 +08:00
duhui 176e86f344 测试支付修改 2023-05-29 20:12:55 +08:00
duhui ab1c913e6f 心愿 2023-05-27 19:13:14 +08:00
xuexinpeng 2cd4efa036 log 2023-05-22 15:27:39 +08:00
xuexinpeng e9cea00128 log输出 2023-05-22 15:07:11 +08:00
duhui 233fb6764e 支付验证修改 2023-05-22 11:07:53 +08:00
duhui 9ba09a5f3e 玩家非空验证 2023-05-21 13:06:40 +08:00
duhui 0d19cccb45 Merge branch 'bt/hefu' into dev_dh_bt 2023-05-19 16:35:56 +08:00
duhui 29a6e674ac 合服测试3 2023-05-18 16:15:15 +08:00
duhui 0166becd77 合服测试3 2023-05-18 13:24:15 +08:00
duhui e8c17d38dd 合服测试2 2023-05-17 16:21:23 +08:00
duhui 0e1e5d22c2 合服测试2 2023-05-17 11:08:40 +08:00
duhui e105b58919 合服测试2 2023-05-17 11:04:48 +08:00
duhui 7121448d7c 合服测试1 2023-05-16 17:45:47 +08:00
xuexinpeng 23061000a0 热更 技能暂时用的悟空的报错log 2023-05-15 14:27:18 +08:00
xuexinpeng ca3ddc523c 跨服排行榜没有数据 2023-05-11 18:08:00 +08:00
xuexinpeng bd54147562 新英雄报错 2023-05-06 16:33:07 +08:00
duhui 068bc814eb 多队塔问题 2023-04-24 17:44:35 +08:00
duhui 6a93bfc6f3 报错兼容 2023-04-24 17:29:04 +08:00
duhui cde4a38d7c Merge branch 'bt/newhero' into dev_dh_bt 2023-04-23 15:15:54 +08:00
duhui d1bcc8aab8 竞技场发奖添加日志 2023-04-23 11:09:40 +08:00
duhui ff865627eb 开天异常处理 2023-04-23 10:52:43 +08:00
duhui 5498f054a0 超值连充重置 2023-04-21 15:14:57 +08:00
duhui 408cc0c7ef 超值连充重置 2023-04-21 15:03:21 +08:00
duhui 8200404a08 1、战斗同步
2、超值连充重置
2023-04-21 14:45:13 +08:00
duhui 430d76aadf 格式优化,没有改逻辑 2023-04-19 17:51:45 +08:00
duhui b2f025713d Merge branch 'dev_dh_bt' into bt/newhero 2023-04-19 15:41:04 +08:00
duhui e0d887806b 法相bug修复 2023-04-19 14:52:28 +08:00
duhui 82a4969341 宝器战力问题 2023-04-18 18:14:28 +08:00
duhui 5dcbfe8d84 Merge branch 'dev_dh_bt' into bt/newhero 2023-04-18 15:14:47 +08:00
duhui 3e04227362 宝器战力问题 2023-04-18 15:06:18 +08:00
duhui 7a02f3271b 青龙秘宝领奖添加验证 2023-04-17 11:36:59 +08:00
duhui 43e53006c2 心魔领奖添加验证 2023-04-14 17:56:02 +08:00
duhui a06538a6ba 1、时空英雄 2023-04-14 17:12:58 +08:00
duhui db8974a8c8 1、巅峰赛部分逻辑添加日志
2、巅峰赛冗余逻辑优化
3、user缓存计数功能暂时注释
2023-04-14 15:26:04 +08:00
duhui 55d0d11ae1 1、战斗同步
2、巅峰赛日志
2023-04-14 14:46:17 +08:00
duhui 20263675c2 购买礼包逻辑小调整 2023-04-12 11:25:46 +08:00
duhui b464e9a630 日志 2023-04-11 16:06:05 +08:00
duhui a55c5bbafe 邮件补充 2023-04-11 16:04:44 +08:00
duhui b19096d9e6 1、redis工具类null异常处理
2、用户缓存优化
3、邮件添加领取和读取日志
2023-04-11 16:00:02 +08:00
duhui 1647adf854 老兼容去除 2023-04-10 14:56:28 +08:00
duhui 5abcb4050b 罗浮邮件 2023-04-07 16:51:18 +08:00
duhui c5e20dde2b 神兵技能 2023-04-07 16:25:35 +08:00
duhui 0e22c4f222 神兵 2023-04-07 13:25:17 +08:00
duhui 02762f8093 罗浮,称号发奖和领取日志 2023-04-06 16:42:58 +08:00
duhui a2728566a5 罗浮,非空验证 2023-04-06 16:40:34 +08:00
duhui 57daa695e5 修改不在线判断条件,由上次离线时间改为上次登陆时间 2023-04-06 16:37:27 +08:00
duhui 97cd0e6e11 神兵战力不再均分 2023-04-17 00:34:21 +08:00
duhui 91448be2d0 Merge remote-tracking branch 'origin/luofu' into bt/duodui
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/sevenworld/SevenWorldLogic.java
2023-04-17 00:25:59 +08:00
duhui eaeb457065 修改redis锁 2023-04-06 14:14:57 +08:00
duhui e5753431c4 修改redis锁 2023-04-06 14:13:13 +08:00
duhui d07a2260a7 特权优化 2023-04-06 13:48:09 +08:00
duhui 480eb4a62f 罗浮 2023-04-04 16:57:07 +08:00
duhui 2d0a740b7c 罗浮 2023-04-04 16:35:27 +08:00
duhui 64b5b4fbc8 神兵 2023-04-04 13:16:26 +08:00
duhui f4209eb50a 关卡挂机金币成长护符收益特权不生效bug处理 2023-03-29 13:53:23 +08:00
duhui 7a95b0e771 七界积分修改 2023-03-27 14:49:14 +08:00
duhui 7046a85c3d 邮件删除日志 2023-03-27 14:15:03 +08:00
duhui 4e2338c7a7 七界bug处理 2023-03-27 13:44:07 +08:00
duhui d7dbcf5828 罗浮争锋日志 2023-03-23 17:40:19 +08:00
duhui 0de72cce63 日志 2023-03-22 13:50:41 +08:00
duhui 32d6670393 日志 2023-03-22 10:59:23 +08:00
duhui 88821c6094 七界和车迟斗法刷新问题 2023-03-21 16:42:03 +08:00
duhui 8c808d2aea 多队塔 2023-03-21 11:34:17 +08:00
duhui 8c634d7df2 公会援助修改 2023-03-06 17:33:43 +08:00
duhui e80315ca22 法相消耗bug处理 2023-03-06 09:46:00 +08:00
duhui 0ee51fe381 法相消耗bug处理 2023-03-06 09:45:15 +08:00