Commit Graph

81 Commits (f9eda6dfe0894d52c002b67b97391308e70022ca)

Author SHA1 Message Date
duhui ba6a32a114 成就任务优化,兼容开服时间条件,补充 2021-10-14 15:37:40 +08:00
duhui dc1ca01483 报错修改 2021-07-30 15:16:39 +08:00
duhui ca861d0788 Merge branch 'master_test_gn_arena' into dev_dh_cross_rank
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/GameApplication.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java
2021-07-30 15:13:09 +08:00
duhui 66c2617d7f 跨服排行榜 2021-07-30 11:26:27 +08:00
duhui 31fd441ae8 跨服获取服务器列表优化 2021-07-29 11:26:43 +08:00
duhui b037147e07 记录版本号和重启时间 2021-07-23 13:55:12 +08:00
mengchengzhen 87463b9b15 自动封禁 2021-05-28 10:58:57 +08:00
lvxinran 24e773aad9 无尽修改初版 2021-05-23 18:06:21 +08:00
zhangshanxue 949cc3cf50 数据上报错误 2020-09-21 20:06:34 +08:00
zhangshanxue f3eea7067d 数据上报目录配置 2020-09-21 16:18:43 +08:00
jiahuiwen d1eccf88b9 代码优化 2020-09-01 17:20:57 +08:00
jiahuiwen c3be084f49 优化代码 2020-09-01 14:45:47 +08:00
zhangshanxue d9bd59ea26 合服 2020-08-17 15:30:25 +08:00
zhangshanxue b643307e5a 合服 2020-08-17 10:26:46 +08:00
zhangshanxue 8fff0be3c3 巅峰赛 2020-08-11 21:48:46 +08:00
zhangshanxue ed7545aba3 控制台gm命令 netty关闭流程修改 2019-12-11 15:19:38 +08:00
wangyuan b3834ed6ee fix fight 2019-11-27 10:33:27 +08:00
zhangshanxue f1dc0fcb4c 网络模块优化 2019-11-26 16:45:29 +08:00
zhangshanxue c4fbe5379b Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/GameApplication.java
#	serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java
#	serverlogic/src/main/java/com/ljsd/jieling/network/session/ISession.java
#	serverlogic/src/main/java/com/ljsd/jieling/thread/ThreadManager.java
2019-11-23 14:17:58 +08:00
zhangshanxue 12692a6ff9 网络模块重构和服务器启动优化 2019-11-23 12:11:03 +08:00
wangyuan f24b6f3ccb set open server time & fix random reward 2019-11-06 16:21:40 +08:00
zhangshanxue 205481e8ab 自动开服配置 2019-11-04 18:25:48 +08:00
wangyuan fab234e810 battle & fix export excel 2019-10-29 13:51:59 +08:00
zhangshanxue 85996ead41 工具模块 配置模块提取 热更新优化 2019-10-11 16:32:20 +08:00
zhangshanxue c6cf91aa70 非注解handler注入 2019-10-09 10:33:37 +08:00
wangyuan 20e9b0f8ec new fight 2019-09-25 09:58:02 +08:00
zhangshanxue 6b96021e08 redis 缓存服务器地址 2019-09-17 14:58:30 +08:00
zhangshanxue 9438cd562a 注册服务器信息 2019-09-16 15:40:18 +08:00
zhangshanxue e925b88ffd Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-12 18:06:55 +08:00
zhangshanxue 258c70642c cdk 2019-09-12 18:06:28 +08:00
wangyuan 70e62476f5 test 2019-09-12 13:51:19 +08:00
wangyuan 2a286218e6 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/GameApplication.java
2019-09-10 10:07:55 +08:00
wangyuan 4f57f75d6d 增加赛季开启类型 2019-09-10 10:05:03 +08:00
lvxinran acbbc8ee4f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-11 22:21:06 +08:00
lvxinran 9eb7a469ff 法宝、公会战无尽副本修改 2019-09-11 22:21:02 +08:00
wangyuan f5ec857e24 自动发现服务器 2019-09-09 16:07:11 +08:00
wangyuan 1b09b921f9 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-09-06 11:04:28 +08:00
lvxinran 183e4954c1 无尽副本提交 2019-08-29 05:52:36 +08:00
lvxinran 0b211bbed1 发送邮件,踢下线 2019-08-21 18:42:06 +08:00
gaojie 745ddbeadf 统一线程处理数据 2019-07-11 10:02:18 +08:00
wangyuan 002557fad1 数据上报 2019-07-05 20:44:18 +08:00
lvxinran 9e2cf35c4e 错误修改 2019-07-05 15:48:32 +08:00
wangyuan 99d2828a6c send http 2019-07-05 14:13:59 +08:00
wangyuan 9e74d3dbc4 delete http pool 2019-07-04 17:46:59 +08:00
gaojie 31988bce68 fix 2019-07-04 11:33:18 +08:00
wangyuan b449d4166e fix daily mission 2019-07-12 15:14:11 +08:00
lvxinran 9245d843b7 线程管理单例修改 2019-06-26 14:49:47 +08:00
wangyuan a5d006e619 indication回复 2019-06-11 20:56:31 +08:00
wangyuan 398b485c69 秘盒时间控制 2019-05-13 16:10:03 +08:00
gaojie 9f25f8bd12 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/GameApplication.java
2019-05-11 11:46:53 +08:00