Commit Graph

8016 Commits (063b551977725cd821dee6dcc7114ac07b5a2bea)
 

Author SHA1 Message Date
grimm 063b551977 代码回滚 2024-06-19 15:45:22 +08:00
grimm dd720d785e 玉虚论道去除平衡属性 2024-06-22 15:56:10 +08:00
grimm 8e027f181e 错误码同步 2024-06-22 15:06:47 +08:00
grimm 52f28057e8 Merge branch 'refs/heads/master_zzxx' into master_xiyou 2024-06-17 15:50:48 +08:00
grimm 81638a0bc6 竞技场挑战 2024-06-17 15:49:22 +08:00
grimm f7dfec8f3e 聊天 2024-06-16 17:26:16 +08:00
grimm 2d361b777f 商店限购 2024-06-16 16:59:46 +08:00
grimm 29805f877a 天天0.1折,开启条件判断 2024-06-16 16:59:23 +08:00
grimm b7e05622ca 聊天 2024-06-14 16:03:08 +08:00
grimm a11b061959 日志 2024-06-13 16:52:40 +08:00
grimm 073e54db5f 天天0.1折活动增加位置开启条件 2024-06-13 16:51:24 +08:00
grimm ccb04c698f 特训道具加速 2024-06-13 16:35:35 +08:00
grimm af542a318c 热更,队伍处理 2024-06-09 10:35:24 +08:00
grimm 99136d3c90 天天0.1折活动bug修复 2024-06-07 19:15:58 +08:00
grimm 10e3680e1e 天天0.1折活动bug修复 2024-06-10 18:35:24 +08:00
grimm a94289e86e 天天0.1折活动bug修复 2024-06-10 18:11:20 +08:00
grimm 0077a33e52 天天0.1折活动bug修复 2024-06-10 17:11:45 +08:00
grimm 21e7993726 热更 2024-06-06 14:55:43 +08:00
grimm a58b840d6a 热更 2024-06-06 11:08:54 +08:00
grimm 7ef3ff3439 Merge branch 'refs/heads/master_zzxx' into master_xiyou 2024-06-04 18:22:15 +08:00
grimm f2d4988ad9 小兵招募加保底 2024-06-04 18:12:13 +08:00
grimm e0695cf73e 小兵招募加保底 2024-06-04 18:04:23 +08:00
grimm 72685e6fb5 热更 2024-06-04 13:55:31 +08:00
grimm e0b0eb793e 小兵奖励可以配null 2024-06-03 16:55:41 +08:00
grimm fd80ebe6d3 主线奖励改直接掉落2 2024-06-03 14:44:04 +08:00
grimm cbdf6c9898 主线奖励改直接掉落,掉落方法区服直接掉落和奖励组掉落(bygroup) 2024-06-03 14:12:04 +08:00
grimm 7393d60955 Merge branch 'refs/heads/master_xiyou' into master_zzxx
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/LoginRequestHandler.java
2024-06-03 14:02:28 +08:00
grimm 8c2f816bfe 热更 2024-06-03 11:32:21 +08:00
grimm 4b3b663032 登陆协议代码修改 2024-06-03 11:25:50 +08:00
grimm 6c5f1accd2 推送礼包创建报错 2024-06-03 11:24:10 +08:00
grimm 9a2d2cc6f5 礼物合成bug修复 2024-06-03 10:56:45 +08:00
grimm 9727e31297 Merge branch 'refs/heads/master_xiyou' into master_zzxx 2024-05-31 18:14:21 +08:00
grimm ea38873779 小兵关卡开启条件加开服天数限制 2024-05-31 17:37:12 +08:00
grimm b2daffb239 热更 2024-05-31 17:05:01 +08:00
grimm 559a40e9f1 热更 2024-05-31 14:57:37 +08:00
grimm d46f236d10 热更 2024-05-31 13:58:01 +08:00
grimm 4880f59535 发奖日志补充 2024-05-31 11:06:19 +08:00
grimm 82656eeda1 登陆文件 2024-05-24 17:44:11 +08:00
grimm d94a14e846 gm充值限制 2024-05-23 18:59:51 +08:00
grimm e926a53c36 Merge branch 'refs/heads/master_zzxx' into master_xiyou
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/thread/task/RetrySendIndicationThread.java
2024-05-22 18:31:23 +08:00
grimm 8785a037de 消息修改 2024-05-22 18:30:38 +08:00
grimm af1b9c065a 优化 2024-05-22 18:23:40 +08:00
grimm b3e2ccf2b7 商店兼容 2024-05-21 17:11:53 +08:00
grimm 9b743e7c51 天天0.1折活动,任务 2024-05-21 17:10:52 +08:00
grimm fc99dd47a4 天天0.1折活动 2024-05-21 16:43:17 +08:00
grimm 3554d42b82 表异常提示 2024-05-21 15:19:50 +08:00
grimm 7fe95d4525 Merge branch 'refs/heads/master_xiyou' into master_zzxx 2024-05-20 18:00:18 +08:00
grimm 597d1c38ba 冲榜奖励 2024-05-20 17:59:12 +08:00
grimm ab652f028f 天天0.1折功能 2024-05-20 15:22:49 +08:00
grimm 312aa58c95 多对塔编队 2024-05-17 18:37:43 +08:00