Commit Graph

7126 Commits (24e60ab8c5e20867cd86644669cc88302ec8b3af)

Author SHA1 Message Date
grimm 9bdd4163c2 循环活动,time类型为6 2024-01-18 11:15:10 +08:00
grimm f6de5eb7d0 循环活动,time类型为6 2024-01-16 17:19:42 +08:00
grimm fe5bed800a 特训gm 2024-01-16 16:18:45 +08:00
grimm 5101384e3b 连续购买日志 2024-01-16 15:08:59 +08:00
grimm cff23b5715 连续购买日志 2024-01-16 15:06:48 +08:00
grimm 5fb5901b47 连续购买日志 2024-01-16 14:37:28 +08:00
grimm 12d46dfacd 未找到英雄异常 2024-01-15 16:24:44 +08:00
grimm 3147706388 公会名称修改为全渠道唯一 2024-01-11 16:06:15 +08:00
grimm 21fc5dd12b 合服后公会区服id未更正修复 2024-01-11 16:01:13 +08:00
grimm 8a9e97259b 礼物不同种类区分 2024-01-09 17:25:03 +08:00
grimm c738e8fc79 战斗异常修改 2024-01-08 17:00:15 +08:00
grimm 8314f3fe89 修复法宝聚灵技能bug 2024-01-05 18:23:01 +08:00
grimm f66cd81f54 助战英雄克隆修改 2024-01-05 14:38:29 +08:00
grimm 27bf841cb6 新增礼物升星功能 2024-01-05 14:01:08 +08:00
grimm 2421d26bc5 gm 删除道具 2024-01-04 17:42:30 +08:00
grimm fd70aadc15 Merge branch 'master_otnew' into master_dev
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoPropertyConverter.java
2024-01-04 15:13:10 +08:00
grimm 1ad5359982 宝器数据丢失异常处理 2024-01-04 15:07:33 +08:00
grimm 14f65b8f60 宝器数据丢失异常处理 2024-01-04 14:23:58 +08:00
grimm 26fcc0706a 宝器数据丢失异常处理 2024-01-04 14:23:10 +08:00
grimm c1344a761f 海贼战斗 2024-01-04 14:22:26 +08:00
grimm 619e187dc2 Merge branch 'master_dev' into master_otnew 2024-01-03 18:56:16 +08:00
grimm c08fb65fd4 英雄技能允许重复实现 2024-01-03 18:54:26 +08:00
grimm 94a82e4d6e 表已修改,回滚 2024-01-02 11:45:27 +08:00
grimm 5a5a82ea5a Merge branch 'master_dev' into master_otnew 2024-01-02 11:44:48 +08:00
grimm f55d9f3cd6 修改合成限制为只限制英雄 2024-01-02 11:43:05 +08:00
grimm 8a8a8a9831 Merge branch 'master_dev' into master_otnew 2023-12-31 15:36:25 +08:00
grimm ea310891c5 法宝丢失问题,助战克隆导致入库数据异常处理 2023-12-31 15:36:01 +08:00
grimm 9f07006ad2 热更 2023-12-30 15:30:09 +08:00
grimm 0eb673e594 添加表内的异常返回类型 2023-12-29 18:39:07 +08:00
grimm 56460c9458 Merge branch 'master_dev' into master_otnew 2023-12-29 17:40:55 +08:00
grimm 4806c9d71e 法宝限制等级修改 2023-12-29 17:39:49 +08:00
grimm 38cd94dc5e Merge branch 'master_dev' into master_otnew 2023-12-29 15:45:19 +08:00
grimm 8c3ba79471 修复助战数据异常bug 2023-12-29 15:44:41 +08:00
grimm 9aa8d5333f Merge branch 'master_dev' into master_otnew 2023-12-29 15:31:00 +08:00
grimm 1b9cbd6f25 修复助战数据异常bug 2023-12-29 15:30:23 +08:00
grimm ecc76d4e87 Merge branch 'master_dev' into master_otnew
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
2023-12-29 14:50:18 +08:00
grimm 651edbb0cb 修复助战数据异常bug 2023-12-29 14:43:56 +08:00
grimm 0741a65840 Merge branch 'master_dev' into master_otnew 2023-12-29 12:07:21 +08:00
grimm f746d02aa3 session异常处理回滚 2023-12-29 12:06:50 +08:00
grimm 4ba0957ef8 Merge branch 'master_dev' into master_otnew 2023-12-28 18:24:14 +08:00
grimm ee237b4996 修复特训建筑立刻升级消耗bug 2023-12-28 18:23:27 +08:00
grimm d82304278d Merge branch 'master_dev' into master_otnew 2023-12-28 14:05:06 +08:00
grimm 1566463f65 法宝星级任务功能完善 2023-12-28 14:04:19 +08:00
grimm ce5a23492e 助战异常,宝物报null,已处理 2023-12-28 14:03:23 +08:00
grimm c7c9d73b0e Merge branch 'master_dev' into master_otnew 2023-12-28 11:39:55 +08:00
grimm 73e8edece0 法宝任务bug修改 2023-12-28 11:39:20 +08:00
grimm a28668dc38 Merge branch 'master_dev' into master_otnew 2023-12-28 10:20:06 +08:00
grimm 86025ab785 session index异常返回报错
法宝类型转换异常报错修复
2023-12-28 10:18:00 +08:00
grimm fc35a7624e Merge branch 'master_dev' into master_otnew 2023-12-27 18:54:23 +08:00
grimm de527d2f01 鸿蒙阵bug修复 2023-12-27 18:53:17 +08:00
grimm 416da4f2ad 公会仅剩1人时,立刻解散公会 2023-12-27 16:32:19 +08:00
grimm 7190830e5e 鸿蒙阵bug修复 2023-12-27 10:18:51 +08:00
grimm 45e973a413 Merge branch 'master_dev' into master_otnew 2023-12-26 16:39:33 +08:00
grimm 6de440fb67 灵兽品质修改,推送礼包 2023-12-26 16:38:32 +08:00
grimm 3c5a876c6b 鸿蒙在修复 2023-12-26 15:47:42 +08:00
grimm 8f421d9147 Merge branch 'master_dev' into master_otnew 2023-12-26 12:46:03 +08:00
grimm 0413850fce 用户缓存减容修改为每小时处理一次 2023-12-26 12:44:25 +08:00
grimm 6a087e99bd 主线怪物削弱bug修复 2023-12-25 16:39:16 +08:00
grimm c9bd854717 Merge branch 'master_dev' into master_otnew 2023-12-25 16:40:24 +08:00
grimm dafff04cff 主线怪物削弱bug修复 2023-12-24 14:19:31 +08:00
grimm 1f87c29b53 Merge branch 'master_dev' into master_otnew 2023-12-24 09:43:44 +08:00
grimm 4b606d9af9 新活动,法宝召唤礼包 2023-12-24 09:41:00 +08:00
grimm f9fa6b20b6 Merge branch 'master_dev' into master_otnew 2023-12-22 17:48:12 +08:00
grimm 48f7f40fa5 登陆玩家信息增加距离开服周数 2023-12-22 17:47:49 +08:00
grimm 89a82513e0 Merge branch 'master_dev' into master_otnew 2023-12-22 14:59:51 +08:00
grimm a6cdc946e7 心魔快速战斗适配战力调整机制补充 2023-12-22 14:59:21 +08:00
grimm 3f56e5edd8 心魔快速战斗适配战力调整机制补充 2023-12-22 14:56:24 +08:00
grimm b282cd18ec Merge branch 'master_dev' into master_otnew 2023-12-22 14:47:04 +08:00
grimm a116e412f2 心魔快速战斗适配战力调整机制 2023-12-22 14:46:40 +08:00
grimm b3ef61108e Merge branch 'master_dev' into master_otnew 2023-12-21 18:40:30 +08:00
grimm c1e1eecb53 小调整,不影响逻辑 2023-12-21 18:40:10 +08:00
grimm fefa3f6332 Merge branch 'master_dev' into master_otnew 2023-12-21 18:33:10 +08:00
grimm bb58217020 Merge branch 'master_dev' into master_otnew
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2023-12-25 15:48:01 +08:00
grimm 32ce67a2b3 注释 2023-12-25 15:45:44 +08:00
grimm 86ae37c126 特训中的英雄无法做材料消耗或分解 2023-12-25 15:44:21 +08:00
grimm 563d25312d 特训中的英雄无法做材料消耗或分解 2023-12-25 15:41:58 +08:00
grimm d4e1a6cefd Merge branch 'master_dev' into master_otnew 2023-12-23 15:15:00 +08:00
grimm c313d27871 挑战副本奖励算法修改 2023-12-23 15:14:30 +08:00
grimm 1dce1ea964 心魔快速战斗适用战力削弱 2023-12-21 18:32:18 +08:00
PC-202302260912\Administrator bb0372370d 修改 2023-12-19 14:12:18 +08:00
PC-202302260912\Administrator 851f0f51f3 鸿蒙阵bug修改,战斗同步 2023-12-19 11:44:39 +08:00
PC-202302260912\Administrator 988292cb65 Merge branch 'master_dev' into master_otnew 2023-12-15 13:47:46 +08:00
PC-202302260912\Administrator cc37af82c3 罗浮未开启修改 2023-12-15 13:47:02 +08:00
PC-202302260912\Administrator d1410377a6 Merge branch 'master_dev' into master_otnew 2023-12-14 16:23:50 +08:00
PC-202302260912\Administrator 923db41225 鸿蒙阵代码回滚,只保留等级 2023-12-14 15:16:52 +08:00
PC-202302260912\Administrator 6a2210eea3 修复bug 2023-12-14 10:38:46 +08:00
PC-202302260912\Administrator 9da26dd78c Merge branch 'master_dev' into master_otnew 2023-12-13 16:29:27 +08:00
PC-202302260912\Administrator 34c562b72f 法宝聚灵增加属性百分比 2023-12-13 16:28:39 +08:00
PC-202302260912\Administrator be102f70b7 Merge branch 'master_dev' into master_otnew
# Conflicts:
#	luafight/Modules/Battle/Config/Data/CombatControl.lua
#	luafight/Modules/Battle/Config/Data/PassiveSkillLogicConfig.lua
#	luafight/Modules/Battle/Config/Data/SkillLogicConfig.lua
#	luafight/Modules/Battle/Readme.txt
2023-12-12 17:41:00 +08:00
PC-202302260912\Administrator ad20cec591 法宝聚灵增加属性百分比 2023-12-12 17:38:59 +08:00
PC-202302260912\Administrator d0d7cfd068 0.1分支战斗处理 2023-12-06 17:28:17 +08:00
PC-202302260912\Administrator daa83310cd 备注修改 2023-12-05 14:30:20 +08:00
PC-202302260912\Administrator e063d4c1da 日志修改 2023-12-05 14:20:01 +08:00
PC-202302260912\Administrator fb8428d254 关卡降低战力 2023-12-05 14:00:24 +08:00
PC-202302260912\Administrator e98e3ea8d1 魂印解锁条件修改,redis模糊查询删除 2023-12-04 15:59:53 +08:00
PC-202302260912\Administrator 0d7d840f20 特训功能补充 2023-11-29 10:54:49 +08:00
PC-202302260912\Administrator 980635e41a 用户缓存逻辑修改 2023-11-28 19:02:27 +08:00
PC-202302260912\Administrator 88689a9824 特训完善,使用道具协议加了几个日志 2023-11-28 19:01:00 +08:00
PC-202302260912\Administrator 825a5cb3ca redis存储队伍英雄模板id,优化部分地方读取用户逻辑,避免批量读取数据库 2023-11-28 15:58:48 +08:00
PC-202302260912\Administrator e2e510dd65 热更 2023-11-28 10:13:08 +08:00