Commit Graph

2595 Commits (31c5e9184dbf2534babe1d0bba83b043e4d1d752)

Author SHA1 Message Date
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
lvxinran 29595f48e0 事件点战力 2019-11-06 18:14:21 +08:00
wangyuan f3587b62cf 优化 2019-11-06 16:57:11 +08:00
wangyuan ed93054208 result 2019-11-06 16:53:59 +08:00
wangyuan 5a25ecf00e fix fight result 2019-11-06 16:48:09 +08:00
lvxinran fc7db60512 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-11-06 16:25:22 +08:00
lvxinran 0d461892e4 删除无用字段 2019-11-06 16:25:18 +08:00
lvxinran cdf7a2ba30 验证此次公会战加入的 2019-11-09 19:04:54 +08:00
wangyuan f24b6f3ccb set open server time & fix random reward 2019-11-06 16:21:40 +08:00
wangyuan 3e338096d5 arena fight result 2019-11-06 16:17:01 +08:00
lvxinran b41d7217ca Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-11-06 13:54:48 +08:00
lvxinran 2d332d205b 法宝掉落修改 2019-11-06 13:54:34 +08:00
zhangshanxue f81124b5f9 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-11-06 13:52:31 +08:00
zhangshanxue fbe7d1b23d 黑名单 服务器检查 2019-11-06 13:52:23 +08:00
lvxinran 7e0d37f785 物品掉落 2019-11-06 11:31:28 +08:00
lvxinran cc6da29f57 装备 法宝 修改 2019-11-05 18:27:06 +08:00
lvxinran 75d5c4aff2 装备修改 2019-11-05 17:57:28 +08:00
wangyuan 2a55d0779d view arena rank 2019-11-05 15:34:09 +08:00
lvxinran 9c60e7b986 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-11-05 15:15:30 +08:00
lvxinran caa48c2cd0 公会大区修改,生成消耗原因方法提交 2019-11-05 15:15:26 +08:00
zhangshanxue 790e37a7a0 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-11-05 14:58:21 +08:00
zhangshanxue 9a5dd40e29 起服前检查 2019-11-05 14:58:17 +08:00
wangyuan 90d9fee405 change time hour to minute 2019-11-05 14:33:25 +08:00
lvxinran d070f16564 观星任务修改 2019-11-04 19:53:46 +08:00
lvxinran 8944b8596c 领取友情点 2019-11-04 19:15:21 +08:00
zhangshanxue 4da9bc7b7d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-11-04 18:25:51 +08:00
zhangshanxue 205481e8ab 自动开服配置 2019-11-04 18:25:48 +08:00
wangyuan 21e2a5202d guide change 2019-11-04 17:41:28 +08:00
wangyuan 3fcd003d5c fix buy store mission 2019-11-04 16:40:29 +08:00
lvxinran c07f2f2b2b 更新地图修改 2019-11-04 15:03:25 +08:00
wangyuan dda12ccfec fix gm 2019-11-04 14:40:31 +08:00
wangyuan 596a8bf291 fix 2019-11-04 12:15:48 +08:00
wangyuan c77c23c2ca backup arena season rank info 2019-11-04 12:14:40 +08:00
lvxinran 80f71c5ca7 邮件删除 2019-11-04 10:57:57 +08:00
lvxinran e2a6865f20 邮件领取 2019-11-04 10:40:56 +08:00
wangyuan 09a53abfb5 fix reward 2019-11-02 11:52:23 +08:00
lvxinran 6b28068a8e 公会战大区 2019-11-01 15:24:46 +08:00
wangyuan afa01af21b daily fresh 2019-11-01 11:03:06 +08:00
zhangshanxue 4c4c942c87 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/BaseHandler.java
2019-11-01 10:17:53 +08:00
wangyuan dca7c2fc53 fix 2019-11-03 10:07:05 +08:00
zhangshanxue 5820505d71 异常和错误提示修改 2019-11-01 10:13:50 +08:00
lvxinran 84efb610d8 加入公会任务 2019-10-31 20:47:14 +08:00
wangyuan ff3cd9a3dc fix reconnect 2019-11-02 19:04:21 +08:00
wangyuan 5dc42912c1 fix 2019-11-02 18:02:23 +08:00
wangyuan a49190f281 fix init 2019-11-02 17:19:29 +08:00
wangyuan a08d6048ba fix relogin 2019-11-02 17:13:07 +08:00
wangyuan e11257f348 delete unuse log 2019-11-02 16:54:30 +08:00
wangyuan 4c12a4c959 fix 2019-11-02 16:52:44 +08:00
zhangshanxue c304989a48 好友报错 2019-10-31 16:20:48 +08:00
lvxinran 8b8a89cd73 怪物战力 2019-10-31 14:18:54 +08:00
lvxinran 2fc51f01c8 初始化set 2019-10-31 11:57:33 +08:00
lvxinran 8f58c62930 第一次进副本类型 2019-10-31 11:42:47 +08:00
lvxinran b35bfe0d1e 好友申请全部同意 2019-10-31 10:45:26 +08:00
lvxinran db6dd9e9b6 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-30 20:46:51 +08:00
wangyuan ef408a0d4c fix fight type 2019-11-01 19:35:43 +08:00
lvxinran 4133c142c5 好友申请 2019-10-30 20:46:46 +08:00
wangyuan c73dc313df update 2019-10-30 19:08:29 +08:00
wangyuan ecfed62e5d fix fight 2019-10-30 19:05:21 +08:00
wangyuan 0dbbcd8456 fix robot pokemon skill data 2019-10-30 17:49:05 +08:00
zhangshanxue e5d58a9f32 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-30 15:25:25 +08:00
zhangshanxue 203c5c8f2c 活动排行榜 2019-10-30 15:25:21 +08:00
wangyuan 436ca6ba7c fix exp 2019-10-30 14:57:49 +08:00
lvxinran dcc2aa541f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-11-02 17:27:54 +08:00
lvxinran e6e27f722c 加入公会任务 2019-11-02 17:27:06 +08:00
zhangshanxue 6d14df0625 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-30 14:18:51 +08:00
wangyuan d6e2822724 fix fight time 2019-10-30 14:18:05 +08:00
zhangshanxue f93bfc4ea3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-30 10:46:58 +08:00
zhangshanxue ca6a2a2658 排行榜结算标题 2019-10-30 10:46:24 +08:00
wangyuan af304a8d85 fix usermission & guild 2019-10-29 17:17:40 +08:00
wangyuan fab234e810 battle & fix export excel 2019-10-29 13:51:59 +08:00
lvxinran b1ebb94ab9 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-31 14:47:57 +08:00
lvxinran 5bb8e95aa1 公会申请数据修改 2019-10-31 14:47:52 +08:00
lvxinran 3f6113ca9f 工会申请保留时间 2019-10-31 14:36:52 +08:00
lvxinran 156456a98e 领取邮件判断 2019-10-30 13:59:56 +08:00
lvxinran d1b82a3879 戒灵秘宝奖励修改 2019-10-29 21:07:35 +08:00
zhangshanxue 121f54fff3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-29 11:33:32 +08:00
zhangshanxue 6189cec63c 异常和错误提示修改 2019-10-29 11:33:26 +08:00
wangyuan 2fea6f9a36 fix itemutil 2019-10-28 15:23:00 +08:00
wangyuan fa9e192375 fix item view 2019-10-28 14:36:19 +08:00
zhangshanxue 09bc84ebcc 重置活动 补发全部奖励 2019-10-28 13:51:22 +08:00
zhangshanxue 5338c735b1 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-11-28 11:47:11 +08:00
zhangshanxue 452d1a84b9 重置活动 补发全部奖励 2019-11-28 11:46:45 +08:00
wangyuan 70dcd12c42 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-10-28 11:36:08 +08:00
wangyuan 520950456d fix rank 2019-10-28 11:35:35 +08:00
wangyuan 6dca605039 挂机奖励预览 2019-10-30 11:04:59 +08:00
lvxinran 6abcb5ce6b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-28 11:23:17 +08:00
lvxinran f8174bddc1 法宝加成判断,公会职位推送修改 2019-10-28 11:23:13 +08:00
wangyuan 93643930c6 fixc resend 2019-10-27 17:35:16 +08:00
wangyuan b0ef60d864 filter 0 2019-10-27 16:37:24 +08:00
wangyuan 3df321bc11 hero 2019-10-27 16:18:08 +08:00
zhangshanxue ccc0b8512a Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-25 15:34:53 +08:00
wangyuan a07565b16b rank 2019-10-27 15:34:21 +08:00
wangyuan 8b0480c652 fix fight rank 2019-10-27 12:03:07 +08:00
zhangshanxue be7a119263 异常和错误提示修改 2019-10-25 15:34:46 +08:00
zhangshanxue b946685cdf 跑马灯 2019-10-25 15:27:24 +08:00
zhangshanxue 62e5c9314c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-25 11:57:08 +08:00
wangyuan d1f50fddf7 fix fight hero passskill 2019-10-27 11:33:27 +08:00
zhangshanxue 14e86450a4 跑马灯 2019-10-25 11:57:03 +08:00
zhangshanxue 070774cc6b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-24 10:34:07 +08:00
zhangshanxue d2be1a3355 异常和错误提示修改 2019-10-24 10:34:02 +08:00
lvxinran d254b2793b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-23 17:38:51 +08:00