Commit Graph

2595 Commits (31c5e9184dbf2534babe1d0bba83b043e4d1d752)

Author SHA1 Message Date
wangyuan 83aac51969 reconnect send heart 2019-11-27 17:05:09 +08:00
lvxinran 2c5148e1ed Merge branch 'online_1121'
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2019-11-27 16:10:41 +08:00
lvxinran 3eddd7610c 战力排行榜 2019-11-27 15:43:24 +08:00
lvxinran e19da91240 战力排行榜部分修改 2019-11-27 13:36:11 +08:00
lvxinran 0de4e4b58d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-11-27 10:49:11 +08:00
lvxinran 2e21d0f580 排行榜重构修改 2019-11-27 10:49:05 +08:00
wangyuan b3834ed6ee fix fight 2019-11-27 10:33:27 +08:00
wangyuan f426a7599d fix guild indicaiton 2019-11-27 10:07:40 +08:00
zhangshanxue f09bb2b684 关卡限制活动 2019-11-27 09:52:04 +08:00
zhangshanxue e1786b61f7 关卡限制活动 2019-11-27 09:30:02 +08:00
wangyuan 4f8bc6ba15 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-11-26 17:42:38 +08:00
wangyuan ad4a55b2ce fight opti 2019-11-26 17:41:38 +08:00
wangyuan 307768615b fix activity 2019-11-26 17:22:31 +08:00
zhangshanxue f1dc0fcb4c 网络模块优化 2019-11-26 16:45:29 +08:00
zhangshanxue ff0279bddc 回退多注释的 2019-11-26 15:55:29 +08:00
lvxinran 7d26a0da25 公会宣言长度 2019-11-26 15:29:43 +08:00
zhangshanxue aab51ba39c 五星成长礼按天刷新 2019-12-02 18:32:40 +08:00
zhangshanxue 8c16c9d9c5 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-11-26 11:17:32 +08:00
zhangshanxue ff37fa5d2c 网络模块优化 2019-11-26 11:17:06 +08:00
zhangshanxue 3cdb228594 五星英雄成长礼 2019-11-25 23:13:52 +08:00
zhangshanxue ba1cb23fb2 五星英雄成长礼 2019-11-25 22:12:44 +08:00
zhangshanxue 26f06a54ae Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121 2019-11-25 21:53:50 +08:00
zhangshanxue 3cf23b39ff recharge协议合并策略 2019-11-25 21:17:29 +08:00
zhangshanxue 27d7504a0e Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121 2019-11-25 20:19:12 +08:00
zhangshanxue 28cb6035d4 五星英雄成长礼 2019-11-25 20:17:30 +08:00
wangyuan f4f4b87dc7 fix map mission cal 2019-11-25 17:29:11 +08:00
lvxinran 2c35bf1b38 部分表字段初始化代码修改 2019-11-25 17:11:21 +08:00
wangyuan 26309eb920 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-11-25 16:13:57 +08:00
wangyuan df7b1345b6 change fight 2019-11-25 16:13:24 +08:00
lvxinran 9c68ef183a Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalGm.java
#	serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java
2019-12-10 03:38:00 +08:00
lvxinran 55549574e4 一键异妖GM,一键科技树GM 2019-12-10 03:34:16 +08:00
wangyuan 3785d4c2f1 fix 2019-11-25 15:36:45 +08:00
wangyuan 07210538c5 保底 2019-11-25 14:14:03 +08:00
wangyuan 8807cc06ea 保底 2019-11-25 12:10:05 +08:00
wangyuan 5203b5011e 优先检测活动刷新 2019-12-25 11:14:07 +08:00
lvxinran 89122a8afd function修改 2019-11-25 11:34:34 +08:00
wangyuan 368006246b ranfom pool 2019-11-25 10:36:38 +08:00
wangyuan 37f5729309 activity mail 2019-11-23 18:03:31 +08:00
lvxinran 813ffebec6 检测功能开启修改 2019-11-23 17:56:42 +08:00
lvxinran e266403589 功能开启关闭修改 2019-11-23 17:15:18 +08:00
zhangshanxue 85eae5a303 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java
2019-11-23 14:20:13 +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
lvxinran 3c59042b88 合并online分支 2019-11-23 14:11:20 +08:00
zhangshanxue 12692a6ff9 网络模块重构和服务器启动优化 2019-11-23 12:11:03 +08:00
zhangshanxue c369ac8d48 活动修改 2019-11-23 11:21:42 +08:00
wangyuan 1631f01146 activity & chat limit message length 2019-11-25 10:51:08 +08:00
wangyuan 199c559446 Merge branch 'online_1121' of 60.1.1.230:backend/jieling_server into online_1121 2019-11-24 19:42:35 +08:00
wangyuan bda2d610f0 activity 2019-11-24 19:42:22 +08:00
zhangshanxue 843e4f921d 活动修改 2019-11-23 11:15:43 +08:00
lvxinran 7cd52a347a 巅峰赛类型修改,坐骑升级修改 2019-12-17 02:30:07 +08:00
lvxinran fc7ed5bde3 坐骑、装饰代码提交 2019-11-26 00:12:32 +08:00
lvxinran c73d9fe16e 充值修改 2019-11-22 19:10:13 +08:00
lvxinran 11c188938e 空物品判断 2019-11-22 17:32:58 +08:00
lvxinran 92736c1034 Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121 2019-12-18 00:40:57 +08:00
lvxinran 183c32a12a 工会修改名字 2019-12-18 00:40:42 +08:00
lvxinran b00ab56b99 公会改名提交 2019-12-17 22:15:06 +08:00
lvxinran 460a9ad41a 试炼本修改 2019-12-17 21:56:30 +08:00
lvxinran 88e1a59289 修改退出地图 2019-12-17 00:43:21 +08:00
lvxinran 1ab6d2a649 Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
2019-12-17 00:41:09 +08:00
lvxinran eedab65f21 强制退出 2019-12-17 00:40:38 +08:00
lvxinran 28efc91bc9 无尽修改 2019-12-17 00:00:51 +08:00
wangyuan bbbd0d60d7 Merge branch 'online_1121' of 60.1.1.230:backend/jieling_server into online_1121 2019-11-22 16:41:13 +08:00
wangyuan db8aeac335 元素招募 & 新活动(新手福利) 2019-11-22 16:39:54 +08:00
wangyuan 56338b360f reconnect endlessmap 2019-11-21 16:14:45 +08:00
wangyuan f6431e2e0f Merge branch 'online_1121' of 60.1.1.230:backend/jieling_server into online_1121 2019-11-21 13:44:19 +08:00
wangyuan 9c337089b4 fix mission 2019-11-21 13:43:48 +08:00
lvxinran 78c7305631 无尽删除信息修改 2019-11-21 10:27:17 +08:00
wangyuan d35d459169 fix arena mission 2019-11-21 10:09:40 +08:00
lvxinran a5e797d543 公会战修改血量百分比 2019-11-20 18:34:34 +08:00
lvxinran 95b447e494 外观装饰获取提交 2019-11-20 18:01:45 +08:00
lvxinran 04bc46d6d7 修改装饰提交 2019-11-20 17:59:41 +08:00
lvxinran 7d02b70750 解散工会修改 2019-11-20 11:59:55 +08:00
lvxinran d786c79bf7 公会战战斗时长修改 2019-11-19 17:58:06 +08:00
lvxinran 16b7479c8c 无尽赛季结束修改 2019-12-10 03:48:23 +08:00
wangyuan 3679665bb6 gm hero full level 2019-11-19 11:15:30 +08:00
zhangshanxue 567cecad79 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-11-18 18:32:00 +08:00
zhangshanxue 7cda58659d 日志 2019-11-18 18:31:55 +08:00
wangyuan 40611e8205 fix arena & fix mainlevel 2019-11-18 17:26:39 +08:00
wangyuan 503217bc43 fix thead 2019-11-18 16:21:10 +08:00
lvxinran f79437f32b 公会战星数修改 2019-11-18 18:37:19 +08:00
wangyuan 9053c6c8c5 fix time 2019-11-18 14:00:50 +08:00
wangyuan b31764a7d5 reload role 2019-11-18 10:12:55 +08:00
wangyuan 30af8125d3 mutilplaty login 2019-11-15 16:37:44 +08:00
wangyuan 0bcc3efb92 fix arena mission 2019-11-15 15:58:26 +08:00
lvxinran 006ce7b1e6 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-11-30 09:05:59 +08:00
lvxinran 301cbbd25d 黑名单处理 2019-11-30 09:05:54 +08:00
lvxinran 2b17fe1f43 一键领取友情点 2019-11-17 11:00:14 +08:00
wangyuan a0d9550bc7 fix bug 2019-11-14 18:29:24 +08:00
wangyuan 24efd56068 fix mission 2019-11-14 18:24:45 +08:00
wangyuan ed7bd22bd7 fix check time 2019-11-14 14:53:09 +08:00
wangyuan e224d50506 fix reconnnect recory 2019-11-17 13:52:35 +08:00
zhangshanxue be16318ce5 gm限制 2019-11-14 13:47:49 +08:00
wangyuan 52aa71a362 修复过五点重连不刷新 2019-11-14 11:29:41 +08:00
wangyuan 440569211f 修复过五点重连不刷新 2019-11-14 10:36:51 +08:00
wangyuan 1ed45e2a46 fix battle buffer 2019-11-13 16:23:28 +08:00
lvxinran dd46d9e219 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-11-13 16:05:02 +08:00
wangyuan c01405846d fix battle buffer 2019-11-13 16:06:50 +08:00
lvxinran c91544f1b6 公会提示 2019-11-13 16:04:56 +08:00
lvxinran 40b43048b5 战力公式计算 2019-11-13 15:22:55 +08:00
lvxinran c9ae1a8ccd 公会提示,怪物战力计算 2019-11-13 14:31:22 +08:00
lvxinran d93f8c2242 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-11-13 11:07:04 +08:00
lvxinran fe098a2443 公会任务修改 2019-11-13 11:06:58 +08:00
wangyuan 2a2c0d921b del record 2019-11-12 18:14:09 +08:00
wangyuan 4d13d9eac8 fix arena 2019-11-12 17:56:30 +08:00
wangyuan 38236142b3 fix arena 2019-11-12 17:41:28 +08:00
wangyuan 7f7ec207f9 fix online reward 2019-11-12 16:33:40 +08:00
lvxinran ad721607bb Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-11-12 11:35:07 +08:00
lvxinran fd6f075151 试炼本推送删除 2019-11-12 11:35:02 +08:00
lvxinran e6aa788f21 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-11-30 22:29:39 +08:00
lvxinran 3b722004b9 在线奖励 2019-11-30 22:29:34 +08:00
wangyuan 3be4be40e6 fix defscore 2019-11-12 11:21:39 +08:00
wangyuan f5955def99 fix store gm 2019-11-11 20:49:29 +08:00
zhangshanxue 6dd5cd1cde Merge branch 'develope_v1' 2019-11-11 19:06:58 +08:00
zhangshanxue 2b3001dc3b 兽潮战斗数据给前端 2019-11-11 17:42:27 +08:00
wangyuan 335576e6b5 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-11-11 17:20:02 +08:00
lvxinran 986132b500 精英副本计数 2019-11-20 14:38:00 +08:00
lvxinran 269994ca54 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-11-20 14:26:55 +08:00
lvxinran 25a0c84064 异步线程修改,任务线程新增 2019-11-20 14:26:50 +08:00
lvxinran 516002defb Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-11-20 11:26:47 +08:00
lvxinran a1f8b46f9e 竞技场任务修改 2019-11-20 11:26:37 +08:00
zhangshanxue cfb59d2db7 兽潮战斗数据给前端 2019-11-11 17:19:38 +08:00
wangyuan 7a45906350 fix online reward 2019-11-11 17:19:18 +08:00
wangyuan ee60381725 fix store refresh 2019-11-11 13:48:18 +08:00
wangyuan 65bcf21de6 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-11-11 11:27:37 +08:00
wangyuan dc4b4402a5 固定刷新 2019-11-11 11:27:18 +08:00
wangyuan dd187758b2 fix 2019-11-11 10:51:45 +08:00
wangyuan 8462e03b43 sore flush 2019-11-11 10:48:33 +08:00
lvxinran 29d1439c50 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-11-08 14:01:20 +08:00
wangyuan 0fb2d0d0bd hint 2019-11-08 14:01:00 +08:00
lvxinran a41bb196cb 友情点 2019-11-08 14:00:55 +08:00
wangyuan 8abdf0aa15 add server time 2019-11-08 14:00:23 +08:00
lvxinran 30de1e8ff5 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-11-08 10:28:13 +08:00
lvxinran 5f5e9c8541 无尽修改 2019-11-08 10:28:08 +08:00
wangyuan f96261e7e0 FIX 2019-11-07 21:37:19 +08:00
wangyuan 2dd97a9988 fix mission 2019-11-07 20:50:54 +08:00
wangyuan 41a99da5ca fix mision 2019-11-07 20:39:03 +08:00
wangyuan bb9b330c50 fix monster force 2019-11-07 19:53:02 +08:00
lvxinran 800975a0a5 无尽默认值修改 2019-11-07 18:43:18 +08:00
wangyuan c8a03c009d fix arena season 2019-11-07 17:21:35 +08:00
wangyuan d57017535f exception 2019-11-07 15:41:45 +08:00
wangyuan 371d47063a fix hero diaplay level 2019-11-07 15:40:03 +08:00
lvxinran de35a2dde7 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-11-07 21:54:50 +08:00
lvxinran beac5b3b61 RedisKey修改 2019-11-07 21:54:46 +08:00
wangyuan 7d8ceae861 fix robot level 2019-11-07 14:17:41 +08:00
wangyuan 934a5af05a Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-11-07 12:04:55 +08:00
lvxinran 963ce826a9 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-11-12 16:57:26 +08:00
lvxinran bbaf8c382d rediskey修改 2019-11-12 16:57:21 +08:00
wangyuan 255c9277ce fix store 2019-11-09 05:01:41 +08:00
wangyuan 76f1408171 fix item 2019-11-08 05:14:27 +08:00
wangyuan 2c21b1e9c4 robot hero info 2019-11-07 12:04:29 +08:00