grimm
|
00d24de76e
|
Merge branch 'master_dev' into master_otnew
|
2024-01-16 14:38:16 +08:00 |
grimm
|
5fb5901b47
|
连续购买日志
|
2024-01-16 14:37:28 +08:00 |
grimm
|
12d46dfacd
|
未找到英雄异常
|
2024-01-15 16:24:44 +08:00 |
grimm
|
44499ee23e
|
Merge branch 'master_dev' into master_otnew
|
2024-01-11 17:15:52 +08:00 |
grimm
|
3147706388
|
公会名称修改为全渠道唯一
|
2024-01-11 16:06:15 +08:00 |
grimm
|
21fc5dd12b
|
合服后公会区服id未更正修复
|
2024-01-11 16:01:13 +08:00 |
grimm
|
deddcd6037
|
Merge branch 'master_dev' into master_otnew
|
2024-01-10 15:13:16 +08:00 |
grimm
|
8a9e97259b
|
礼物不同种类区分
|
2024-01-09 17:25:03 +08:00 |
grimm
|
d62458e3d4
|
战斗热更
|
2024-01-08 17:03:34 +08:00 |
grimm
|
e6f0fe8218
|
战斗热更
|
2024-01-08 17:02:39 +08:00 |
grimm
|
3a32c8f5bb
|
Merge branch 'master_dev' into master_otnew
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java
|
2024-01-08 17:01:41 +08:00 |
grimm
|
c738e8fc79
|
战斗异常修改
|
2024-01-08 17:00:15 +08:00 |
grimm
|
8d20b64ce3
|
战斗同步
|
2024-01-08 17:00:04 +08:00 |
grimm
|
29fc92526e
|
热更
|
2024-01-08 10:46:03 +08:00 |
grimm
|
43a2c16a99
|
Merge branch 'master_dev' into master_otnew
|
2024-01-05 18:24:18 +08:00 |
grimm
|
8314f3fe89
|
修复法宝聚灵技能bug
|
2024-01-05 18:23:01 +08:00 |
grimm
|
4b8b97685e
|
战斗回滚
|
2024-01-05 15:29:18 +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
|
af7192f07b
|
战斗
|
2024-01-04 14:15:14 +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
|
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 |