Commit Graph

7859 Commits (cfbc6e00efc080aed8fff726a13f4e8bd897dded)
 

Author SHA1 Message Date
grimm 9cbb9f06a4 热更 2024-03-15 10:42:04 +08:00
grimm bedc8a1c0a 好友推荐优化 2024-03-13 18:11:52 +08:00
grimm fc0c3b1250 热更 2024-03-12 15:19:45 +08:00
grimm 5d3b41d7fb 热更 2024-03-12 15:18:57 +08:00
grimm d08b0cb12e 热更 2024-03-06 16:29:58 +08:00
grimm adc6b73d6b 热更 2024-03-06 16:24:49 +08:00
grimm 221713d2ec 热更 2024-03-06 16:22:49 +08:00
grimm 7fc1d5c3a9 循环活动临时版 2024-03-06 16:14:32 +08:00
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 20f77be81d 热更 2024-03-05 17:18:24 +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 f99362b388 vip刷新逻辑修改 2024-02-27 17:01:04 +08:00
grimm 16e05fd4b7 vip刷新逻辑修改 2024-02-27 16:15:42 +08:00
grimm 66d8a77118 线上热更 2024-02-26 14:11:56 +08:00
grimm 0c55069829 线上热更,vip刷新 2024-02-26 14:10:04 +08:00
grimm 05f2ebf7eb 线上热更,vip刷新 2024-02-23 16:37:25 +08:00
grimm a7cfe8c300 线上热更 2024-02-19 14:11:25 +08:00
grimm 6a47c21db0 线上热更 2024-02-19 14:10:53 +08:00
grimm 23ad55fdcf 线上热更 2024-02-12 19:13:51 +08:00
grimm 2a1fc6a66d 线上热更 2024-02-12 19:13:11 +08:00
grimm f1f73d205f 线上热更 2024-02-12 19:10:12 +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 99b25f9f82 Merge branch 'master_dev' into master_otnew 2024-01-29 17:47:18 +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 71931154e5 牛气冲天活动bug修改 2024-01-29 17:18:04 +08:00
grimm 6f0a8cda79 牛气冲天活动bug修改 2024-01-29 16:29:30 +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 3997625a8b 热更 2024-01-25 10:57:23 +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 c83cdd4022 热更 2024-01-18 11:17:35 +08:00