grimm
|
d5d62aaf00
|
Merge branch 'master_ob2' into cycle_activity_ob2
# Conflicts:
# conf/c_database_version.json
# conf/hotfix.json
# serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaRecordInfoRequestHandler.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java
|
2024-03-05 18:36:47 +08:00 |
grimm
|
efa47029bc
|
循环活动结束时间,前端展示
|
2024-03-05 16:36:48 +08:00 |
grimm
|
4fcebd8359
|
循环活动结束时间,前端展示
|
2024-03-05 16:32:32 +08:00 |
grimm
|
2adb0938be
|
循环活动结束时间,前端展示
|
2024-03-05 16:28:34 +08:00 |
grimm
|
66d8a77118
|
线上热更
|
2024-02-26 14:11:56 +08:00 |
grimm
|
6a47c21db0
|
线上热更
|
2024-02-19 14:10:53 +08:00 |
grimm
|
23ad55fdcf
|
线上热更
|
2024-02-12 19:13:51 +08:00 |
grimm
|
d5de53e6a6
|
Merge remote-tracking branch 'origin/master_ob2' into master_ob2
|
2024-02-12 19:08:58 +08:00 |
grimm
|
7b061cf442
|
线上热更
|
2024-02-12 19:07:30 +08:00 |
grimm
|
a3eae1a429
|
循环周卡
|
2024-01-29 18:13:54 +08:00 |
grimm
|
9a617bccd6
|
牛气冲天活动bug修改
|
2024-01-29 17:38:40 +08:00 |
grimm
|
88cd6a2d43
|
牛气冲天活动bug修改
(cherry picked from commit 6f0a8cda79 )
|
2024-01-29 17:38:08 +08:00 |
grimm
|
98044a5bce
|
循环周卡领取bug处理
|
2024-01-29 16:09:45 +08:00 |
grimm
|
8da5ec551c
|
删除血战到底任务部分逻辑,查询到没有上层调用
|
2024-01-29 14:34:35 +08:00 |
grimm
|
05faac1c8f
|
牛气冲天活动修改
|
2024-01-29 14:31:29 +08:00 |
grimm
|
c15edeff6e
|
循环活动二版
|
2024-02-03 18:49:34 +08:00 |
grimm
|
5b82fa8fb6
|
循环活动二版
|
2024-02-03 18:45:49 +08:00 |
grimm
|
065d492cde
|
Merge branch 'master_dev' into cycle_activity
|
2024-02-03 17:29:37 +08:00 |
grimm
|
19fbf52c46
|
循环活动初版
|
2024-01-29 17:25:51 +08:00 |
grimm
|
37eca15b46
|
牛气冲天活动
|
2024-01-25 18:17:27 +08:00 |
grimm
|
6ab029cff4
|
牛气冲天活动
|
2024-01-25 18:08:18 +08:00 |
grimm
|
a34c8013d9
|
经验道具
|
2024-01-25 17:12:38 +08:00 |
grimm
|
0360262525
|
经验道具
|
2024-01-25 16:50:07 +08:00 |
grimm
|
b3e7918545
|
经验道具
|
2024-01-25 16:38:14 +08:00 |
grimm
|
702bc42abd
|
活动时间类型
|
2024-01-25 15:32:55 +08:00 |
grimm
|
227f57090d
|
错误修复
|
2024-01-25 15:23:53 +08:00 |
grimm
|
c5c10b4703
|
热更
|
2024-01-25 10:51:04 +08:00 |
grimm
|
49165586a3
|
经验到上限后不发邮件
|
2024-01-22 11:28:38 +08:00 |
grimm
|
402cdf3c99
|
热更
|
2024-01-20 17:42:54 +08:00 |
grimm
|
782cd915fd
|
gm功能,修补玩家法相错误数据
|
2024-01-18 11:16:08 +08:00 |
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
|
28420b4ae8
|
热更
|
2024-01-16 10:22:53 +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
|
e7c7458568
|
热更
|
2024-01-11 15:03:59 +08:00 |
grimm
|
8a9e97259b
|
礼物不同种类区分
|
2024-01-09 17:25:03 +08:00 |
grimm
|
c738e8fc79
|
战斗异常修改
|
2024-01-08 17:00:15 +08:00 |
grimm
|
8d20b64ce3
|
战斗同步
|
2024-01-08 17:00:04 +08:00 |
grimm
|
7b7c5550c6
|
热更
|
2024-01-08 10:55:11 +08:00 |
grimm
|
3fcdc2f279
|
热更
|
2024-01-08 10:46:44 +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 |