Commit Graph

55 Commits (df9f1501c2a3760e6be757cc519d4d3d5647eb39)

Author SHA1 Message Date
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 18f91727e4 第一版
(cherry picked from commit 12c3d5d1ba0766fc17b69959690a656dabf14fc6)
2021-09-17 14:13:29 +08:00
duhui 3592547ada 助战英雄战力 2021-09-02 15:25:21 +08:00
xuexinpeng f4402cd95f Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-07-30 18:49:43 +08:00
xuexinpeng 77f5f9150b 新将招募 任务限制 2021-07-30 18:47:44 +08:00
duhui c5debd98ad Merge branch 'master_test_gn_arena' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java
2021-07-30 18:43:07 +08:00
xuexinpeng a1aaf10802 【逐胜之巅优化】功能改为在开服指定天数后开启 2021-07-29 16:02:59 +08:00
duhui d51a4715e0 跨发,十绝阵功能合并 2021-07-28 14:02:13 +08:00
lvxinran 94f9847844 合并分支 2021-07-31 00:01:41 +08:00
duhui b037147e07 记录版本号和重启时间 2021-07-23 13:55:12 +08:00
lvxinran 88871d789a Merge branch 'master_test_gn' into master_test_gn_arena
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
2021-08-01 08:08:27 +08:00
duhui 48617157b8 跨服, 十绝阵 2021-07-21 10:40:24 +08:00
xuexinpeng 70576ce70a 活动类型:5 2021-07-19 15:46:20 +08:00
xuexinpeng cdaeb7c971 新活动类型:5 2021-07-16 18:56:13 +08:00
xuexinpeng f30d36473d 新加活动类型:5 2021-07-16 17:07:17 +08:00
lvxinran ce10e5f88a 修改成常量 2021-07-12 11:33:45 +08:00
lvxinran 3d340f2511 时间设置修改 2021-07-12 11:31:21 +08:00
lvxinran 103819f770 清除修改无用日志 2021-06-08 03:08:27 +08:00
mengchengzhen c9f3eaaaa6 新礼包首冲bug指定时间5月6日18点 2021-05-06 21:21:05 +08:00
mengchengzhen 8cd82e7325 首冲bug防止问题方法 2021-05-08 21:03:29 +08:00
mengchengzhen 3af3a725c3 新礼包 2021-04-28 00:27:43 +08:00
mengchengzhen 7d91d069aa 新礼包测试 2021-04-22 13:55:20 +08:00
mengchengzhen c48ad44e27 新礼包 2021-04-20 15:03:50 +08:00
zhangshanxue de27c8aea3 跨服提交 2021-02-20 20:13:15 +08:00
lvxinran 416beb8d33 分组提交 2020-12-01 10:55:37 +08:00
zhangshanxue 210f4a1529 社稷大典代码提交 2020-10-25 17:00:00 +08:00
zhangshanxue 055516fc95 八日登录验证bug 2020-09-21 13:24:51 +08:00
jiahuiwen d1eccf88b9 代码优化 2020-09-01 17:20:57 +08:00
jiahuiwen f6d885559b Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-09-01 10:45:21 +08:00
lvxinran 834f6e303e 八日登录修改,公会副本边界,不发排行奖励修改 2020-09-09 08:13:51 +08:00
jiahuiwen 8e31ca0acf 优化代码 2020-09-01 10:45:16 +08:00
zhangshanxue 60abb970a9 Merge branch 'master' into master_test_combin
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
2020-08-13 19:28:39 +08:00
zhangshanxue cbde195205 合服 2020-08-13 19:26:18 +08:00
lvxinran 502aa7ca45 时间工具方法 2020-08-17 05:29:48 +08:00
lvxinran 47ad4f8c1c 回春散逻辑提交 2020-06-05 10:16:09 +08:00
zhangshanxue 5d1ff52c3d 活动提交 2020-04-30 19:57:17 +08:00
lvxinran bf8a3a59d7 戒灵秘宝时间剩余 2020-03-25 05:01:03 +08:00
lvxinran 4148f0d9ee 特权修改时发送挂机奖励 2020-01-14 13:41:22 +08:00
lvxinran 2cea466917 时间类修改 2020-01-08 18:38:14 +08:00
lvxinran 7c0ac91a44 特权时间修改,红包时间修改 2020-01-08 02:36:36 +08:00
lvxinran 262be7dde8 排行榜修改 2019-11-29 11:19:48 +08:00