Commit Graph

1945 Commits (474180788bccbbbf99a4a055d745bcd92a342cb2)

Author SHA1 Message Date
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
zhangshanxue 63fc8dbd14 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-20 19:35:00 +08:00
zhangshanxue 01810351bb 招财猫回退 2019-09-20 19:34:42 +08:00
wangyuan d24fce49ab data report 2019-09-12 16:53:06 +08:00
wangyuan 70e62476f5 test 2019-09-12 13:51:19 +08:00
wangyuan 96bf9d7482 fix chat 2019-09-12 11:38:09 +08:00
wangyuan eddd5459e0 fix chat 2019-09-12 10:55:31 +08:00
wangyuan 5a59ae0090 chat 2019-09-12 10:11:35 +08:00
lvxinran a11a644dca Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-12 10:05:35 +08:00
lvxinran 135b9756c6 物品流水日志 2019-09-12 10:05:31 +08:00
wangyuan 001477cbb6 friend limit 2019-09-11 14:27:58 +08:00
lvxinran c032ea2eaa Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-11 14:22:32 +08:00
lvxinran 4f84f0d815 无尽副本修改 2019-09-11 14:22:28 +08:00
lvxinran 16cbf1c5ef Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-14 12:26:04 +08:00
lvxinran d5a202d28e 任务修改 2019-09-14 12:26:00 +08:00
lvxinran fb8a4bcc70 法宝任务添加 2019-09-14 11:27:32 +08:00
lvxinran e401393677 任务添加 2019-09-14 11:27:04 +08:00
wangyuan ed379a2524 flushtime 2019-09-11 11:52:31 +08:00
zhangshanxue 521b7d062a 一键装备 2019-09-11 10:51:48 +08:00
zhangshanxue da3ad5f06e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-11 10:23:52 +08:00
zhangshanxue 4481b5a8c0 gm 跑马灯 2019-09-11 10:10:01 +08:00
zhangshanxue 5545dec693 问卷重开 2019-09-10 21:12:26 +08:00
zhangshanxue 049975b931 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-10 20:41:57 +08:00
zhangshanxue ba608937cc 装备战力 2019-09-10 20:41:50 +08:00
wangyuan f7f54df716 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-09-10 20:12:30 +08:00
lvxinran 08324adb91 匹配时星数显示 2019-09-13 12:19:12 +08:00
lvxinran d49eb6114b 聊天检测 2019-09-12 12:12:51 +08:00
wangyuan c3dc931ea2 fix 2019-09-10 20:09:30 +08:00
zhangshanxue 952b1dd161 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-10 18:24:52 +08:00
lvxinran 3ef8b5766b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-12 18:44:50 +08:00
lvxinran b52d314375 无尽修改N。。。 2019-09-12 18:44:46 +08:00
lvxinran 4f39ea2210 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-12 16:19:28 +08:00
lvxinran 713a0b7c04 无尽修改 2019-09-12 16:19:23 +08:00
zhangshanxue de65f12114 在线人数 2019-09-10 18:24:46 +08:00
wangyuan 135450f507 fix network 2019-09-10 16:10:28 +08:00
zhangshanxue dfeaf4bae0 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-10 15:55:46 +08:00
zhangshanxue 14d21eb6ec 移除功能开启检查 2019-09-10 15:55:42 +08:00
zhangshanxue a3b84a9b2d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-10 14:30:47 +08:00
zhangshanxue 9bb332835e 魂印功能限制 2019-09-10 14:30:42 +08:00
wangyuan 2810683713 fix time 2019-09-10 14:14:32 +08:00
wangyuan 98d92373ac fix table 2019-09-10 14:03:51 +08:00
wangyuan 5633e399e9 fix 2019-09-10 13:50:38 +08:00
wangyuan d1efc48e47 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
2019-09-10 13:49:50 +08:00
zhangshanxue abd7ebd875 观星开启 2019-09-10 13:25:53 +08:00
wangyuan 11376e12b1 fix map team 2019-09-10 12:01:05 +08:00
zhangshanxue f36c71cada 问卷修改 2019-09-10 11:54:20 +08:00
lvxinran 30d56d2ad1 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-12 11:08:59 +08:00
lvxinran a1e0d88052 无尽本报错 2019-09-12 11:08:55 +08:00
zhangshanxue 91582654ae Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-10 10:21:38 +08:00
zhangshanxue 33d1cf6a03 魂印 2019-09-10 10:21:01 +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
zhangshanxue a51abcbe92 魂印 2019-09-10 10:02:59 +08:00
zhangshanxue f8ab3f7967 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-10 00:01:38 +08:00
lvxinran 46e7fd5c23 血量修改 2019-09-11 23:29:45 +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
zhangshanxue d04f6fe3bf 掉落 2019-09-10 00:01:17 +08:00
zhangshanxue 84104a5971 问卷调查优化 2019-09-09 20:35:00 +08:00
zhangshanxue 2aa64192a4 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-09 16:35:15 +08:00
zhangshanxue 08d29d6cce 更新bug 2019-09-09 16:35:03 +08:00
wangyuan f5ec857e24 自动发现服务器 2019-09-09 16:07:11 +08:00
zhangshanxue 5ff27b049c token验证 2019-09-09 15:04:39 +08:00
zhangshanxue 1b61c88da1 token验证 2019-09-09 14:23:29 +08:00
zhangshanxue d0728bae5f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-09 14:16:28 +08:00
zhangshanxue 967a744a81 掉落 2019-09-09 14:16:23 +08:00
wangyuan f85de0b94c fix random 2019-09-09 12:38:21 +08:00
zhangshanxue 9e8cec3727 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-09 12:00:11 +08:00
zhangshanxue 88dc18da7b 问卷删除缓存 2019-09-09 11:59:34 +08:00
lvxinran a533fd4c1a 无尽副本血量修改 2019-09-09 11:55:30 +08:00
lvxinran 8285f4363e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-09 11:31:57 +08:00
lvxinran 52a27ee882 法宝等级限制,46行为修改 2019-09-09 11:31:51 +08:00
zhangshanxue 8dc4700f13 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-09 11:28:52 +08:00
zhangshanxue 2e35ab977e 魂印临时背包掉落 2019-09-09 11:28:46 +08:00
wangyuan cd38e82643 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-09-09 10:45:03 +08:00
wangyuan fc2994c577 time 2019-09-09 10:42:13 +08:00
lvxinran 7be649a804 无尽副本修改,法宝修改 2019-09-09 10:39:59 +08:00
lvxinran 54ad281831 试炼精气值 2019-09-09 09:58:45 +08:00
wangyuan 2a5490a030 time 2019-09-07 21:40:45 +08:00
wangyuan 78154b6adc Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/config/SBloodyBattleSetting.java
2019-09-07 20:05:37 +08:00
wangyuan 0db40f7fde bloody 2019-09-07 20:03:06 +08:00
zhangshanxue 47ac97d2ca Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-07 19:45:34 +08:00
zhangshanxue 5a05c80ef3 魂印掉落 2019-09-07 19:45:30 +08:00
lvxinran 8bfa9dc498 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-07 19:26:31 +08:00
lvxinran cb95002a8f 血战时间限制 2019-09-07 19:26:27 +08:00
zhangshanxue 4f9b3404dd Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-07 17:20:46 +08:00
zhangshanxue f5fb83d1b4 token验证 2019-09-07 17:20:41 +08:00
zhangshanxue 91c017cbd5 魂印掉落 2019-09-07 17:18:22 +08:00
lvxinran 3defe3d54c 法宝掉落 2019-09-07 16:31:19 +08:00
lvxinran d88ed321c8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-07 15:03:56 +08:00
lvxinran d6f2b203e0 公会修改、试炼修改 2019-09-07 15:03:33 +08:00
wangyuan e1cbbac567 圣火令 2019-09-07 14:48:08 +08:00
wangyuan 69057cf41b Merge branch 'split'
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/blood/BloodLogic.java
2019-09-07 14:15:04 +08:00
wangyuan a5a285f081 血战积分奖励 2019-09-07 14:13:25 +08:00
wangyuan 201f510e38 bloody 2019-09-07 14:12:09 +08:00
lvxinran c7d61c098d 无尽本修改 2019-09-07 13:56:30 +08:00
zhangshanxue 5ef6a8debc Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-07 13:34:41 +08:00
zhangshanxue c8cbfcaa43 魂印掉落 2019-09-07 13:34:36 +08:00
lvxinran d95f112bd0 法宝默认 2019-09-06 20:46:56 +08:00