Commit Graph

93 Commits (f756444b5aed6ce5803fa511b633ea010c6019ae)

Author SHA1 Message Date
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
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 d86d08821b 修改启服报错 2021-07-01 18:29:39 +08:00
lvxinran 103819f770 清除修改无用日志 2021-06-08 03:08:27 +08:00
lvxinran dfd2bdc968 无尽修改第三版 2021-06-01 00:06:40 +08:00
xuexinpeng 7e21e0df43 山河社稷 2021-05-15 15:05:11 +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
duhui f73102ff3b 竖线格式化 2021-03-11 16:53:01 +08:00
duhui b1d5c773c2 四灵试炼,跑马灯 2021-03-10 16:09:24 +08:00
duhui ba269c61b8 大闹天宫,灵兽问题处理 2021-03-03 17:16:03 +08:00
lvxinran 2de51c477f 忽略协议文件 2021-01-01 01:34:58 +08:00
zhangshanxue de27c8aea3 跨服提交 2021-02-20 20:13:15 +08:00
lvxinran bcf5191e7f 协议位置修改 2020-12-30 03:11:14 +08:00
zhangshanxue e3b2fedbcd 跨服服务器 2021-02-08 01:25:47 +08:00
zhangshanxue b7b1154a68 跨服服务器 2021-01-30 00:15:10 +08:00
lvxinran e086fd1e97 十绝阵删除信息修改 2020-12-25 10:19:50 +08:00
lvxinran 5cd2499af6 跨服十绝阵第二版 2020-12-17 20:07:30 +08:00
lvxinran fb5da8c93b Merge branch 'master_test_hw_server_arena' of http://60.1.1.230/backend/jieling_server into master_test_hw_server_arena
# Conflicts:
#	gamecommon/src/main/java/rpc/protocols/CommonProto.java
#	gamecommon/src/main/java/rpc/protocols/MessageTypeProto.java
#	gamecommon/src/main/java/rpc/world/WorldProto.java
#	worldserver/build.gradle
#	worldserver/src/main/java/com/world/handler/GetWorldArenaChallengeRequestHandler.java
#	worldserver/src/main/java/com/world/handler/GetWorldArenaRecordInfoRequestHandler.java
#	worldserver/src/main/java/com/world/redis/RedisKey.java
2020-12-12 15:06:17 +08:00
lvxinran ac40a91389 跨服十绝阵代码提交 2020-12-12 15:03:54 +08:00
zhangshanxue 95870b74d5 跨服服务器 2020-12-11 13:57:47 +08:00
zhangshanxue 4bce4b8e96 跨服服务器 2020-12-07 14:44:12 +08:00
zhangshanxue bfb89434cd 跨服服务器 2020-12-03 21:02:17 +08:00
zhangshanxue 6b4d5296db Merge branch 'master_test_hw_server_arena' of http://60.1.1.230/backend/jieling_server into master_test_hw_server_arena 2020-11-27 15:27:06 +08:00