Commit Graph

7126 Commits (24e60ab8c5e20867cd86644669cc88302ec8b3af)

Author SHA1 Message Date
PC-202302260912\Administrator 7d52ab08a1 罗浮优化 2023-11-27 17:12:54 +08:00
PC-202302260912\Administrator ead65db5c4 特训 2023-11-24 18:45:15 +08:00
PC-202302260912\Administrator 5306957945 特训 2023-11-24 17:05:51 +08:00
PC-202302260912\Administrator d0af42766c 特训 2023-11-24 17:01:10 +08:00
PC-202302260912\Administrator 4375c9f3cb 命石抽奖该为只消耗一种道具 2023-11-24 16:40:05 +08:00
PC-202302260912\Administrator 2103dd4bf0 异常处理 2023-11-23 11:48:27 +08:00
PC-202302260912\Administrator 02e616fae9 特训初版 2023-11-21 17:59:28 +08:00
PC-202302260912\Administrator 2fe831ea4d 同步 2023-11-16 10:57:31 +08:00
PC-202302260912\Administrator 99c7bdf11c 战斗技能修改 2023-11-13 18:21:39 +08:00
PC-202302260912\Administrator 0f51ad7600 礼物和修仙属性修改 2023-11-02 17:52:36 +08:00
PC-202302260912\Administrator 2953c3fbe6 报错修改 2023-11-02 16:40:11 +08:00
PC-202302260912\Administrator 4012e07f0a 命石增加每日抽卡次数上限 2023-10-30 10:37:54 +08:00
PC-202302260912\Administrator fa7487bf1d 命石增加每日抽卡次数上限 2023-10-27 19:06:19 +08:00
PC-202302260912\Administrator 63f1408a45 回滚神将修改,法宝抽卡修改 2023-10-27 14:26:32 +08:00
PC-202302260912\Administrator 50eacabe17 法宝提交 2023-10-25 18:56:42 +08:00
PC-202302260912\Administrator ba91d21afd 法宝升级修改 2023-10-24 19:08:15 +08:00
PC-202302260912\Administrator 63d10823ee Merge branch 'master_dev' into master_dev_fabao
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoPropertyConverter.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
2023-10-23 17:58:30 +08:00
PC-202302260912\Administrator c4b2fdf92b 战斗修改 2023-10-23 17:39:11 +08:00
PC-202302260912\Administrator 0181282032 注释删除 2023-10-23 14:17:24 +08:00
PC-202302260912\Administrator 7b16960002 注释删除 2023-10-23 13:57:17 +08:00
PC-202302260912\Administrator ddf2daacc7 编队战力修改 2023-10-20 16:58:20 +08:00
PC-202302260912\Administrator cda5c9121b 助战修改 2023-10-19 18:23:44 +08:00
PC-202302260912\Administrator c3c9d51e7f 法宝重写 2023-10-19 18:13:49 +08:00
PC-202302260912\Administrator 85526fac97 法宝初版,删除旧跨服英雄方法 2023-10-19 18:01:47 +08:00
PC-202302260912\Administrator 31b97ac40c 法相,宝器重写,原法宝功能删除,待修改 2023-10-18 14:11:56 +08:00
PC-202302260912\Administrator 2a24bf37df 逻辑优化 2023-10-17 16:19:06 +08:00
PC-202302260912\Administrator e98ff31de5 鸿蒙阵功能关闭 2023-10-17 10:51:50 +08:00
PC-202302260912\Administrator e1ad8231d1 礼物回滚 2023-10-13 16:30:22 +08:00
PC-202302260912\Administrator 4b840e5750 潜能战力调整 2023-10-12 17:04:53 +08:00
PC-202302260912\Administrator dee7978c3a 潜能 2023-10-11 18:22:23 +08:00
PC-202302260912\Administrator a6aaa6d28b 热更代码 2023-09-26 20:57:27 +08:00
PC-202302260912\Administrator ba3123906c 神将分解返回礼物 2023-09-26 14:19:32 +08:00
PC-202302260912\Administrator c5d92afaf4 神将分解返回礼物 2023-09-26 10:47:35 +08:00
PC-202302260912\Administrator 58bf6f0375 检查回滚 2023-09-26 10:20:14 +08:00
PC-202302260912\Administrator 355152d178 热更 2023-09-25 21:22:33 +08:00
PC-202302260912\Administrator 9f019317b3 合服掉封禁问题处理 2023-09-25 16:01:26 +08:00
PC-202302260912\Administrator 48e1b51c47 热更 2023-09-22 16:17:00 +08:00
PC-202302260912\Administrator 3a8fd72ae5 热更 2023-09-22 14:09:07 +08:00
PC-202302260912\Administrator b0433d5e37 热更 2023-09-21 22:30:26 +08:00
PC-202302260912\Administrator 1106721a87 热更 2023-09-21 21:24:43 +08:00
PC-202302260912\Administrator c8a035fcdf 更新 2023-09-21 20:21:29 +08:00
PC-202302260912\Administrator 556a03e3ed 挖矿问题修改 2023-09-21 15:42:21 +08:00
PC-202302260912\Administrator bb6795b755 礼物装备 2023-09-21 15:41:49 +08:00
PC-202302260912\Administrator 9183594d06 礼物装备 2023-09-20 13:45:18 +08:00
PC-202302260912\Administrator 10f915d00c 礼物装备 2023-09-20 11:33:48 +08:00
PC-202302260912\Administrator 89c41eec78 礼物装备 2023-09-13 17:15:03 +08:00
PC-202302260912\Administrator ab67613577 礼物装备 2023-09-13 15:21:42 +08:00
PC-202302260912\Administrator e64744105e 礼物装备 2023-09-13 15:14:29 +08:00
PC-202302260912\Administrator ba818ad0a1 礼物装备 2023-09-13 15:07:45 +08:00
PC-202302260912\Administrator 1c68fd6145 神兵被动 2023-09-08 11:46:33 +08:00
PC-202302260912\Administrator 89cf02ed1a 月卡问题处理 2023-09-06 18:01:55 +08:00
PC-202302260912\Administrator 1e104d4ec9 热更 2023-09-05 18:33:12 +08:00
PC-202302260912\Administrator 6372ce36a7 战力扩充为long 2023-09-05 14:40:34 +08:00
PC-202302260912\Administrator ec6f2c6c3a 热更恢复 2023-09-01 18:49:14 +08:00
PC-202302260912\Administrator bece9581b3 日志去除 2023-09-01 15:56:25 +08:00
PC-202302260912\Administrator 1b345924de 命石抽奖优化 2023-09-01 11:42:49 +08:00
PC-202302260912\Administrator 83634c822e 命石日志 2023-09-01 11:04:07 +08:00
PC-202302260912\Administrator 242799ffe2 命石 2023-08-31 14:56:42 +08:00
PC-202302260912\Administrator 513b3b68e1 礼包错误数据处理 2023-08-28 17:42:11 +08:00
PC-202302260912\Administrator 0ec3fe16b6 Merge branch 'master_ob2' into master_dev 2023-08-25 17:28:30 +08:00
PC-202302260912\Administrator 6e69024fd4 命格,宝石 2023-08-25 17:27:46 +08:00
PC-202302260912\Administrator 53dff854cd 热更公会bug 2023-08-25 11:26:02 +08:00
PC-202302260912\Administrator 3ded8132e3 热更公会bug 2023-08-25 11:23:41 +08:00
PC-202302260912\Administrator ec1d89d998 热更公会bug 2023-08-25 11:06:45 +08:00
PC-202302260912\Administrator 454345fff4 公会问题修改 2023-08-24 00:03:23 +08:00
PC-202302260912\Administrator 9a6f98bc42 合服代码修改 2023-08-22 14:25:35 +08:00
PC-202302260912\Administrator 8a85fd6ed3 合服代码修改 2023-08-22 11:48:06 +08:00
PC-202302260912\Administrator 3ecd85d16b 战力修改 2023-08-21 17:20:39 +08:00
PC-202302260912\Administrator 42e79a2546 战力修改 2023-08-21 17:08:26 +08:00
PC-202302260912\Administrator 0d5bb21157 战力修改,山河试炼改为开服时间校验 2023-08-21 15:45:18 +08:00
DESKTOP-C3M45P4\dengdan f45cb1507d 增加道具异常登录检测 2023-08-16 19:22:00 +08:00
DESKTOP-C3M45P4\dengdan 1eba9fd9ba 修改商店购买传入负数的问题 2023-08-16 12:22:54 +08:00
DESKTOP-C3M45P4\dengdan 3b616bd845 修改商店刷物品的bug 2023-08-15 21:05:41 +08:00
PC-202302260912\Administrator 090fe26a22 战力同步 2023-08-14 16:09:38 +08:00
PC-202302260912\Administrator 8aa5f9cdad 邮件修改 2023-08-14 14:52:08 +08:00
PC-202302260912\Administrator f5008cbf62 bug 2023-08-10 11:40:20 +08:00
PC-202302260912\Administrator e86e01e23d 魂灵宝战力问题处理,热更 2023-08-09 18:02:30 +08:00
PC-202302260912\Administrator 23005ce431 开天上报注释 2023-08-09 14:48:06 +08:00
PC-202302260912\Administrator 1493bbfbca cpu性能优化 2023-08-09 14:31:50 +08:00
PC-202302260912\Administrator 619899b028 工会boss挑战次数刷新修改 2023-08-09 11:00:27 +08:00
PC-202302260912\Administrator c220070f59 区服id修改 2023-08-09 10:35:50 +08:00
PC-202302260912\Administrator 620528a9c3 跨服 2023-08-09 10:22:25 +08:00
PC-202302260912\Administrator cbc5444634 战力问题修改 2023-08-08 15:49:22 +08:00
PC-202302260912\Administrator 8195177d87 修改礼包限购次数问题 2023-08-07 21:34:36 +08:00
PC-202302260912\Administrator ee66a8d42c 热更 2023-08-07 19:57:29 +08:00
PC-202302260912\Administrator 6d8b910c28 热更 2023-08-07 16:09:00 +08:00
PC-202302260912\Administrator 22c1544335 日志优化 2023-08-07 14:39:07 +08:00
PC-202302260912\Administrator b96c008047 熱更 2023-08-07 14:01:18 +08:00
PC-202302260912\Administrator 3e70166697 熱更 2023-08-07 13:04:54 +08:00
PC-202302260912\Administrator 3915f25665 优化 2023-08-04 13:42:11 +08:00
PC-202302260912\Administrator 6eb47c0a72 优化 2023-08-04 11:33:08 +08:00
PC-202302260912\Administrator c07e035c17 神印套装修改 2023-08-03 17:13:33 +08:00
PC-202302260912\Administrator 59b425a73e 优化 2023-08-02 15:15:40 +08:00
PC-202302260912\Administrator ee336f0110 优化 2023-08-02 15:14:48 +08:00
PC-202302260912\Administrator de1bc8de1a 优化 2023-08-02 13:57:08 +08:00
PC-202302260912\Administrator 60cbfe2590 redis工具优化,四灵缓存优化 2023-07-31 16:45:23 +08:00
PC-202302260912\Administrator 5eb5ae4679 优化 2023-07-31 14:18:16 +08:00
PC-202302260912\Administrator 61c38929f0 Merge branch 'master_huanxiang' into master_ob2
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/DailyRefreshEventProcess.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java
2023-07-31 14:06:18 +08:00
PC-202302260912\Administrator ad334b30d3 优化 2023-07-31 14:03:55 +08:00
PC-202302260912\Administrator c297f5184a 大闹天宫改活动 2023-07-25 17:23:23 +08:00
PC-202302260912\Administrator 710ad4c35d 任务刷新逻辑修改 2023-07-25 17:22:27 +08:00
PC-202302260912\Administrator d8a7fbbd89 bug 2023-07-24 16:30:00 +08:00
PC-202302260912\Administrator eff7205fb8 任务刷新逻辑修改 2023-07-20 18:51:45 +08:00
PC-202302260912\Administrator 10f8b89faa 任务优化 2023-07-20 16:46:18 +08:00
PC-202302260912\Administrator e55c2e593d 删除无尽副本任务 2023-07-20 15:28:39 +08:00
PC-202302260912\Administrator 90c4c479f4 Merge branch 'master_huanxiang' into master_ob2 2023-07-20 15:07:06 +08:00
PC-202302260912\Administrator 42189f66b8 任务优化,删除无尽副本任务 2023-07-20 15:06:37 +08:00
PC-202302260912\Administrator c91ebe929d Merge branch 'master_huanxiang' into master_ob2
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/CumulationData.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/FabaoDrawTaskManager.java
2023-07-21 19:00:40 +08:00
PC-202302260912\Administrator 71d02b86d5 法宝任务 2023-07-21 18:58:14 +08:00
PC-202302260912\Administrator 0a2ea2cdfb 任务 2023-07-21 18:56:52 +08:00
PC-202302260912\Administrator dc32f02102 法宝任务 2023-07-21 18:29:04 +08:00
PC-202302260912\Administrator b1cacd05f1 法宝任务 2023-07-21 18:09:48 +08:00
PC-202302260912\Administrator e8e008b4d1 法宝任务 2023-07-21 17:58:29 +08:00
PC-202302260912\Administrator b4fa3e8e2d 法宝任务 2023-07-21 17:50:09 +08:00
PC-202302260912\Administrator 1470230ee4 法宝任务 2023-07-21 17:42:21 +08:00
DESKTOP-C3M45P4\dengdan cd6ce783cf 屏蔽初始化玉虚论道模板英雄 2023-07-20 14:48:10 +08:00
PC-202302260912\Administrator d8734b999b 支付用分计算 2023-07-20 13:47:44 +08:00
PC-202302260912\Administrator 0934ef3c0d 支付用分计算 2023-07-20 13:45:58 +08:00
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