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
|
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
|
c5d92afaf4
|
神将分解返回礼物
|
2023-09-26 10:47:35 +08:00 |
PC-202302260912\Administrator
|
58bf6f0375
|
检查回滚
|
2023-09-26 10:20:14 +08:00 |