Commit Graph

7171 Commits (master_haizei)

Author SHA1 Message Date
grimm 5835a43618 消息bug修复 2024-06-25 14:52:39 +08:00
grimm 8636770150 竞技场挑战消耗 2024-06-17 15:56:46 +08:00
grimm 2e967bd83d 热更 2024-06-06 11:57:28 +08:00
grimm a17d624cfe 无用代码注释 2024-05-31 18:10:59 +08:00
grimm 10c76f1332 异常提示提交 2024-05-27 10:54:17 +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 e7bec4b926 Merge branch 'cycle_activity' into master_0.05
# Conflicts:
#	conf/c_database_version.json
2024-04-01 13:46:49 +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 c0ddc38d70 礼物升星 2024-04-01 11:36:47 +08:00
grimm d08dea2dd5 循环活动bug处理 2024-03-28 16:45:00 +08:00
grimm 8ab1f93bb5 循环活动bug处理 2024-04-01 16:28:26 +08:00
grimm 99acbb8dad 循环活动bug处理 2024-03-28 16:12:01 +08:00
grimm 7c421103af 循环活动bug处理 2024-04-01 15:02:25 +08:00
grimm 6624b6162a 循环活动bug处理 2024-03-28 14:03:17 +08:00
grimm ef62916994 日志 2024-03-27 18:07:51 +08:00
grimm e28318ccf3 用户缓存线程修改 2024-03-26 14:35:14 +08:00
grimm c8f47d0a7a 用户缓存线程修改 2024-03-26 14:22:03 +08:00
grimm 9c8b2e2aa7 玩家缓存清理线程优化 2024-03-22 15:30:35 +08:00
grimm dfa546ac98 循环活动二改 2024-03-21 18:09:12 +08:00
grimm b847d03e2b 英雄道具日志 2024-03-21 15:07:42 +08:00
grimm b1f60947ca 装备加道具日志 2024-03-21 14:32:32 +08:00
grimm 6aafcc9cd2 聊天修改 2024-03-18 14:48:48 +08:00
grimm a27e058066 聊天去锁 2024-03-18 13:55:50 +08:00
grimm 7afdf411bf 装备更新修改,数据库存储 2024-03-18 10:30:02 +08:00
grimm bedc8a1c0a 好友推荐优化 2024-03-13 18:11:52 +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 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