Commit Graph

7859 Commits (cfbc6e00efc080aed8fff726a13f4e8bd897dded)
 

Author SHA1 Message Date
grimm 9f07006ad2 热更 2023-12-30 15:30:09 +08:00
grimm 58deda94fe 热更 2023-12-30 15:20:54 +08:00
grimm 0eb673e594 添加表内的异常返回类型 2023-12-29 18:39:07 +08:00
grimm af201fea2e 热更 2023-12-29 17:42:28 +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 6907377d81 热更 2023-12-29 15:45:40 +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 c67bcd0bbe 热更 2023-12-29 15:31:59 +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 1f9031822c 热更 2023-12-29 12:27:49 +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 388d284d87 热更 2023-12-28 18:53:31 +08:00
grimm 92f9b22c99 热更 2023-12-28 18:34:02 +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 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 de51a1551a 热更 2023-12-28 10:38:17 +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 46432d820b 热更 2023-12-24 09:43:00 +08:00
grimm 5b44360c67 战斗同步 2023-12-24 09:42:24 +08:00