Commit Graph

132 Commits (a9014b74ca28547318034f7157fef3ddf09cd9af)

Author SHA1 Message Date
grimm a9014b74ca Merge branch 'master_0.05' into master_dev
# Conflicts:
#	gamecommon/src/main/java/util/TimeUtils.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/WeekCardLogic.java
2024-04-08 11:23:08 +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 7c421103af 循环活动bug处理 2024-04-01 15:02:25 +08:00
grimm cec77edb48 Merge branch 'master_0.05' into master_dev 2024-03-22 17:34:35 +08:00
grimm 9c8b2e2aa7 玩家缓存清理线程优化 2024-03-22 15:30:35 +08:00
grimm dfa546ac98 循环活动二改 2024-03-21 18:09:12 +08:00
grimm 6bf881b06d 竞技场重写初版 2024-02-06 14:54:09 +08:00
grimm 19fbf52c46 循环活动初版 2024-01-29 17:25:51 +08:00
grimm f6de5eb7d0 循环活动,time类型为6 2024-01-16 17:19:42 +08:00
PC-202302260912\Administrator ddf2daacc7 编队战力修改 2023-10-20 16:58:20 +08:00
PC-202302260912\Administrator 6e69024fd4 命格,宝石 2023-08-25 17:27:46 +08:00
PC-202302260912\Administrator 60cbfe2590 redis工具优化,四灵缓存优化 2023-07-31 16:45:23 +08:00
PC-202302260912\Administrator 42189f66b8 任务优化,删除无尽副本任务 2023-07-20 15:06:37 +08:00
PC-202302260912\Administrator d76438ab99 商店修改 2023-07-04 17:10:02 +08:00
PC-202302260912\Administrator c5cd4fb8bd 天降礼包补充 2023-06-28 18:54:30 +08:00
PC-202302260912\Administrator fc5cba8376 礼包初该 2023-06-16 13:59:34 +08:00
duhui 88821c6094 七界和车迟斗法刷新问题 2023-03-21 16:42:03 +08:00
duhui 89be667495 七界发奖优化 2023-02-24 21:01:32 +08:00
duhui 9e7a84476a 获取周一零点 2023-02-20 17:54:44 +08:00
duhui 17c2291269 法相 2023-02-19 19:40:52 +08:00
duhui 860a126523 排行榜分数修正 2023-02-15 11:03:07 +08:00
duhui 0b1155bf3f 优化第一期 2023-02-07 17:06:59 +08:00
duhui f1e45eaa70 maven镜像 2023-01-09 16:02:39 +08:00
duhui 9e636e277b 1. 线下妖晶返利活动bug修复
2. 邮件支持long数量道具
2023-01-09 15:22:55 +08:00
duhui c6cb0c2bff 修改gm线下返利活动 2022-12-08 11:56:07 +08:00
duhui fd21726937 送十万真充活动初版 2022-11-18 15:09:30 +08:00
duhui 8f602dfebe gm充值返利活动 2022-11-01 11:17:31 +08:00
duhui f723ae905c 刷冲特权问题修改2 2022-09-22 18:13:30 +08:00
duhui 3881e066ed 直购首冲活动 2022-09-19 16:32:55 +08:00
duhui 9e6c8637da 活动时间修改 2022-09-09 18:03:57 +08:00
duhui 73a0b91d3e 送无限抽活动 2022-09-07 16:05:52 +08:00
duhui 844b0114cd 摘星阁装备调整初版,未联调 2022-08-19 18:12:57 +08:00
duhui 43873b23eb 周卡月卡调整,兼容老版本2 2022-06-10 19:06:38 +08:00
xuexinpeng 9f3e6f2efe 灵脉秘境发奖根据表时间段走 2022-05-25 19:45:05 +08:00
DESKTOP-98AVA47\Administrator 2ceaa10726 四灵试炼次数问题 2022-05-30 01:03:23 +08:00
duhui f86f4e5676 四灵试炼开启天数管理 2022-04-21 14:06:25 +08:00
duhui df9f1501c2 家园特权,重复购买问题解决 2022-01-19 17:04:52 +08:00
xuexinpeng f6ac2a88bd 探索时间戳进位 2021-12-31 17:33:31 +08:00
xuexinpeng d4daed3d65 跨服灵脉秘境 2021-11-18 21:08:32 +08:00
xuexinpeng fc2d33d4c9 周卡相关 2021-11-01 13:18:29 +08:00
duhui 606b22a670 御剑行合并 2021-10-20 13:44:18 +08:00
duhui 7ab321cc75 成就任务优化,兼容开服时间条件 2021-10-14 15:36:48 +08:00
duhui 1e7cc6dea2 御剑飞行 2021-10-14 11:12:23 +08:00
duhui 385db300e4 每日累充,网页支付特殊处理 2021-09-27 15:29:18 +08:00
duhui a7b964ffcc 排行榜问题,和发奖时间日志 2021-10-10 23:34:35 +08:00
duhui a52efb87e1 跨服,返回第几周 2021-10-02 18:44:00 +08:00
duhui eb3c5d359b 玲珑宝阁,十连抽 2021-09-23 14:25:24 +08:00
duhui 18f91727e4 第一版
(cherry picked from commit 12c3d5d1ba0766fc17b69959690a656dabf14fc6)
2021-09-17 14:13:29 +08:00
duhui 3592547ada 助战英雄战力 2021-09-02 15:25:21 +08:00
duhui 3b843d949b 四灵代码合并 2021-08-31 11:56:33 +08:00