Commit Graph

7720 Commits (227f57090d7ab904a63cf245ab317583b18a0c17)
 

Author SHA1 Message Date
grimm ee237b4996 修复特训建筑立刻升级消耗bug 2023-12-28 18:23:27 +08:00
grimm f05c37956b 热更 2023-12-28 17:11:51 +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 91bf71e612 热更恢复 2023-12-26 13:20:27 +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 bb97c16a2f 热更 2023-12-25 19:00:33 +08:00
grimm 6a087e99bd 主线怪物削弱bug修复 2023-12-25 16:39:16 +08:00
grimm 0fa5c7aaba 热更 2023-12-24 19:01:40 +08:00
grimm b9d5257ae9 热更恢复 2023-12-24 16:47:59 +08:00
grimm 074e84420f 热更 2023-12-25 16:41:01 +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 5b44360c67 战斗同步 2023-12-24 09:42:24 +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 51ebe23d8d 战斗同步 2023-12-19 14:23:34 +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