Commit Graph

7928 Commits (f5eb45b65ec7990c3b5d8df35987fe6212b2c661)
 

Author SHA1 Message Date
grimm f5eb45b65e 规范修正,不涉及代码
(cherry picked from commit ae42277f88)
2024-06-17 17:07:31 +08:00
grimm 5b31f6fe15 罗浮,gm功能,交换排名
(cherry picked from commit 0801930225)
2024-06-17 17:07:20 +08:00
grimm ee2464169c 罗浮,gm功能,交换排名
(cherry picked from commit 71657f7afb)
2024-06-17 17:07:14 +08:00
grimm ffcc775991 罗浮,第一次机器人删除
(cherry picked from commit b019268a95)
2024-06-17 17:07:08 +08:00
grimm f42c18a283 罗浮,bug优化
(cherry picked from commit 9295289b88)
2024-06-17 17:07:01 +08:00
grimm c92c93edc4 罗浮 2024-06-17 17:06:40 +08:00
grimm 68b7a188c4 罗浮改版,初始化和发奖改为线程处理
(cherry picked from commit 18ff8bb3ea)
2024-06-17 17:05:34 +08:00
grimm fa6db0470d 罗浮 2024-06-17 17:02:33 +08:00
grimm 2d64eb4bc1 上线邮件 2024-06-17 16:33:41 +08:00
grimm 8636770150 竞技场挑战消耗 2024-06-17 15:56:46 +08:00
grimm 9da2f9a08d 热更 2024-06-06 14:58:11 +08:00
grimm 2e967bd83d 热更 2024-06-06 11:57:28 +08:00
grimm fbc2eea615 热更 2024-06-03 10:41:41 +08:00
grimm 5739d3cb71 热更 2024-05-31 19:07:08 +08:00
grimm a17d624cfe 无用代码注释 2024-05-31 18:10:59 +08:00
grimm 146ba0e25e 热更 2024-05-29 18:48:02 +08:00
grimm b7e3be0ce1 热更 2024-05-29 18:43:39 +08:00
grimm 6f0c879985 热更 2024-05-29 18:29:41 +08:00
grimm 10c76f1332 异常提示提交 2024-05-27 10:54:17 +08:00
grimm 53b88a7811 热更 2024-05-26 11:37:02 +08:00
grimm 41ffe7e29f 热更 2024-05-24 17:46:05 +08:00
grimm ad421a7e8d 热更 2024-05-22 13:24:51 +08:00
grimm f01987063c 商店兼容 2024-05-22 13:24:30 +08:00
grimm a8964a6fd6 神话心愿 2024-05-10 19:02:48 +08:00
grimm f2f641772c 全民礼包活动rediskey修改
(cherry picked from commit ff8bda897d)
2024-05-07 14:55:20 +08:00
grimm 7862405b57 活动推送过长问题处理 2024-05-07 14:53:54 +08:00
grimm 9b339bc710 注释老合服逻辑,已经不用了
(cherry picked from commit e279c64bdd)
2024-05-06 18:42:24 +08:00
grimm aec568bea7 新竞技场发奖日志修改
(cherry picked from commit a346c89c99)
2024-05-06 18:42:13 +08:00
grimm 6b171fdad3 新竞技场发奖线程问题修复 2024-05-06 18:41:51 +08:00
grimm d09723580e taskkit 线程池数量由8增加到10
(cherry picked from commit 191ef1ff83)
2024-05-06 18:35:00 +08:00
grimm c43b9eb56d 跨服排行榜逻辑改为线程池调用 2024-05-06 18:34:41 +08:00
grimm 6368008837 战斗校验逻辑优化 2024-05-06 18:31:16 +08:00
grimm b760741462 礼包逻辑修改 2024-05-06 18:29:29 +08:00
grimm 0ed2ab4036 用户缓存修改,改为线程安全得
(cherry picked from commit ddca7dfd7f)
2024-05-06 18:23:52 +08:00
grimm 1b7c18a355 日志删除 2024-04-23 18:19:37 +08:00
grimm 9dc9bea2eb Merge branch 'master_0.05' into master_haizei
# Conflicts:
#	gamecommon/src/main/java/util/TimeUtils.java
#	serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/GmDialActivity.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/WeekCardLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java
2024-04-23 18:19:25 +08:00
grimm da13ea697f 礼物升星 2024-04-15 17:27:00 +08:00
grimm e607cb442d 法宝替换修改 2024-04-11 16:17:16 +08:00
grimm 38c06778f1 公会任命 2024-04-02 16:23:45 +08:00
grimm 0ff0bc218c 助战报错 2024-04-02 16:07:09 +08:00
grimm 24e60ab8c5 热更重置 2024-04-01 13:47:06 +08:00
grimm e7bec4b926 Merge branch 'cycle_activity' into master_0.05
# Conflicts:
#	conf/c_database_version.json
2024-04-01 13:46:49 +08:00
grimm b621421917 Merge branch 'master_ob2' into cycle_activity
# Conflicts:
#	conf/c_database_version.json
2024-04-01 13:46:15 +08:00
grimm bbb9d414f8 Merge branch 'master_otnew' into cycle_activity
# Conflicts:
#	conf/c_database_version.json
#	conf/hotfix.json
2024-04-01 13:43:24 +08:00
grimm 8cc94c9051 循环活动,百抽活动 2024-04-03 17:42:44 +08:00
grimm d0784058a3 循环活动,寻宝密宗 2024-04-03 17:24:37 +08:00
grimm 40d6675eb9 热更重置 2024-04-01 11:37:22 +08:00
grimm c0ddc38d70 礼物升星 2024-04-01 11:36:47 +08:00
grimm d2bcfe7d6b 热更 2024-03-29 13:58:57 +08:00
grimm d08dea2dd5 循环活动bug处理 2024-03-28 16:45:00 +08:00