Commit Graph

7880 Commits (a9014b74ca28547318034f7157fef3ddf09cd9af)
 

Author SHA1 Message Date
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 984a7943df 经验到上限后不发邮件 2024-01-25 10:56:41 +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
grimm 3a1c796ea5 Merge branch 'master_dev' into master_otnew 2024-01-18 11:16:33 +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 89504dec5c 热更 2024-01-16 15:53:49 +08:00
grimm 82d9aefe6f 热更 2024-01-16 15:34:57 +08:00
grimm 595bf1e493 Merge branch 'master_dev' into master_otnew 2024-01-16 15:09:18 +08:00
grimm 5101384e3b 连续购买日志 2024-01-16 15:08:59 +08:00
grimm 5a5e1b2d23 Merge branch 'master_dev' into master_otnew 2024-01-16 15:07:11 +08:00
grimm cff23b5715 连续购买日志 2024-01-16 15:06:48 +08:00
grimm cb34967218 热更 2024-01-16 14:39:56 +08:00
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 28420b4ae8 热更 2024-01-16 10:22:53 +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 e7c7458568 热更 2024-01-11 15:03:59 +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 7b7c5550c6 热更 2024-01-08 10:55:11 +08:00
grimm 3fcdc2f279 热更 2024-01-08 10:46:44 +08:00