Commit Graph

2175 Commits (f246d8ce74b0d331c4a6dfb0eb8e4698a1d5ff39)

Author SHA1 Message Date
lvxinran 994f38dd78 Merge branch 'develop'
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/config/SSpecialConfig.java
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java
2019-10-10 10:11:24 +08:00
lvxinran ea8ab53cb8 戒灵秘宝 2019-10-10 10:04:02 +08:00
lvxinran a8f94462d7 孙龙宝藏修改不发0等级 2019-10-19 18:57:37 +08:00
lvxinran 138af14f00 孙龙宝藏修改 2019-10-19 16:49:38 +08:00
wangyuan 0de65cad89 fix msg 2019-10-09 19:38:19 +08:00
wangyuan 5c70a649da print log 2019-10-09 18:31:12 +08:00
wangyuan dcc606cb3c fix reason 2019-10-09 18:28:53 +08:00
zhangshanxue 3d769948ad Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-09 18:16:19 +08:00
zhangshanxue 0ac0b161f5 活动奖励领完 重置进度 2019-10-09 18:16:13 +08:00
wangyuan fc42f6c655 limit 2019-10-09 18:04:36 +08:00
wangyuan f0e4c61ccc reason 2019-10-09 17:36:19 +08:00
zhangshanxue 2062561e7e 热加载新类 2019-10-09 17:03:46 +08:00
wangyuan 2f3701fe49 fix indicaiton 2019-10-09 16:07:27 +08:00
wangyuan 0d58fa4b38 黑名单 2019-10-09 15:58:55 +08:00
zhangshanxue f47b80ea14 幸运探宝 2019-10-09 15:25:06 +08:00
zhangshanxue 5eb8af467a jar中查找类 2019-10-09 15:23:11 +08:00
zhangshanxue e8e1f7b744 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-09 15:12:16 +08:00
zhangshanxue 981191c053 jar中查找类 2019-10-09 15:12:11 +08:00
wangyuan ee140b7495 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-10-09 14:38:04 +08:00
wangyuan 81b5ec7236 fix final fight 2019-10-09 14:36:48 +08:00
wangyuan 0e44a8795f fix fastreward & fix especialEquip misison 2019-10-09 14:13:23 +08:00
zhangshanxue c6cf91aa70 非注解handler注入 2019-10-09 10:33:37 +08:00
zhangshanxue f9dab7ddae Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-08 18:56:28 +08:00
zhangshanxue 0758d2da32 兽潮快速战斗 2019-10-08 18:56:05 +08:00
wangyuan 03c948bf9a des 2019-10-08 18:06:45 +08:00
wangyuan 29a6ab23a3 des 2019-10-08 16:38:02 +08:00
wangyuan 0da5001de3 battle 2019-10-08 16:35:19 +08:00
wangyuan 65d1405b13 hero lock & fix msg 2019-10-08 16:30:00 +08:00
wangyuan d302e893b4 hero lock 2019-10-08 15:59:36 +08:00
wangyuan 36340f3a18 跑马灯& 回溯 2019-10-08 15:31:28 +08:00
zhangshanxue 6f1972e902 幸运探宝 2019-10-08 10:04:26 +08:00
zhangshanxue dd496531a3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
2019-09-28 11:01:22 +08:00
zhangshanxue 13cb402343 幸运探宝 2019-09-28 11:00:06 +08:00
wangyuan 6cbab124e9 add login white 2019-09-27 18:11:26 +08:00
wangyuan 8d92dcbfdc fix map 2019-09-27 17:38:17 +08:00
lvxinran 162b0880b7 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-27 15:02:56 +08:00
lvxinran 4fa201093a 已加入工会提示 2019-09-27 15:02:46 +08:00
wangyuan 9c33a505a6 Merge branch 'project0.93' 2019-09-27 14:58:45 +08:00
wangyuan 3f17df4540 fix gm 2019-09-27 14:53:07 +08:00
wangyuan 85bb61208d upload 2019-09-27 14:17:33 +08:00
wangyuan 7bd4b67364 fix item drop 2019-09-27 14:10:36 +08:00
wangyuan 21dba7ff37 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-09-27 14:05:50 +08:00
wangyuan 29caa89314 fix bug 2019-09-27 14:05:30 +08:00
lvxinran 8867433bf4 Merge branch 'project0.93' 2019-09-27 13:36:46 +08:00
lvxinran 6e4ba9ed73 公会走路 2019-09-27 13:36:09 +08:00
lvxinran ffc3e7890d 公会战bug 2019-09-29 12:06:40 +08:00
wangyuan 2900cade4c vip特权结算收益 2019-09-27 11:53:56 +08:00
wangyuan 12b13fa6b0 OFFLINE TIME 2019-09-27 11:40:59 +08:00
zhangshanxue b98fd6b273 幸运探宝 2019-09-27 11:16:35 +08:00
wangyuan cc1a749227 好友赠送友情点 2019-09-27 10:38:13 +08:00
wangyuan c70ea68e76 delete log 2019-09-27 10:25:23 +08:00
wangyuan 514a4086b6 fix 2019-09-27 10:22:42 +08:00
wangyuan ac8466f081 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/config/SGlobalSystemConfig.java
2019-09-27 10:21:16 +08:00
wangyuan 405ab16ed0 new fight 2019-09-27 10:18:38 +08:00
lvxinran 0319fcefae 公会优化 2019-09-27 04:52:58 +08:00
lvxinran 9d90c6f661 工会申请列表红点 2019-09-26 17:56:15 +08:00
lvxinran 63687ab6cd Merge branch 'project0.93' 2019-09-27 04:53:12 +08:00
lvxinran ae3e1e9a71 Merge branch 'project0.93' 2019-09-27 04:51:30 +08:00
wangyuan 9357d3e802 fix team id 2019-09-26 15:53:27 +08:00
zhangshanxue aff8be52f7 Merge branch 'project0.94'
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_role_gm.java
2019-09-26 14:20:13 +08:00
zhangshanxue f10ff47dc4 gm命令 异步事件分发 探宝活动 2019-09-26 14:18:27 +08:00
wangyuan 24c49c8cfe fix report 2019-09-26 13:44:35 +08:00
wangyuan ae1b86a695 fix 2019-09-26 11:04:43 +08:00
wangyuan cb46ed50c8 Merge branch 'newfight'
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/config/STestWelfare.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
2019-09-26 10:36:41 +08:00
wangyuan 201765fd9f fix maxlevel 2019-09-26 10:27:28 +08:00
wangyuan 9067ca3e07 new fight & workshoplevel & herolevel 2019-09-26 10:06:55 +08:00
lvxinran 1cd0fe5ce7 孙龙宝藏重置 2019-09-26 09:54:17 +08:00
zhangshanxue cf8066ae5c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-25 15:39:23 +08:00
zhangshanxue e76e1f93c6 定时系统邮件 2019-09-25 15:39:17 +08:00
lvxinran b5d2808ec8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-25 14:48:00 +08:00
lvxinran 04002b3fac 公会相关 2019-09-25 14:47:54 +08:00
lvxinran ffd91d6adb gm无尽商店 2019-09-28 08:22:40 +08:00
wangyuan 0b2d08276c log 2019-09-25 14:06:58 +08:00
lvxinran c2be0dc3f8 无尽商店 2019-09-25 10:54:27 +08:00
lvxinran 38ff05edb4 怪物战力 2019-09-25 10:53:34 +08:00
wangyuan e0aaca6306 fix 2019-09-25 10:37:14 +08:00
wangyuan a7f07c668e log 2019-09-25 10:34:09 +08:00
lvxinran 7ebb58041c 表格报错 2019-09-25 10:26:52 +08:00
wangyuan 95d82b59bd fix store 2019-09-25 10:14:46 +08:00
wangyuan 20e9b0f8ec new fight 2019-09-25 09:58:02 +08:00
lvxinran c208d37eb5 邮件修改 2019-09-24 21:38:26 +08:00
lvxinran 2cb3065187 无尽地图 2019-09-28 08:09:58 +08:00
lvxinran 63ee75cc2d 地图修改 2019-09-28 07:03:09 +08:00
lvxinran 711ae66483 无尽修改 2019-09-28 07:02:27 +08:00
lvxinran e88fb2a1ec 无尽地图 2019-10-12 11:02:09 +08:00
lvxinran b7d95499b9 无尽出生点 2019-10-12 09:17:18 +08:00
lvxinran 3214ede819 无尽商店 2019-10-05 08:41:39 +08:00
lvxinran 8f20e52680 公会战最终提交。。。 2019-09-24 21:34:38 +08:00
lvxinran 5a6b460d8b Merge branch 'develop' of http://60.1.1.230/backend/jieling_server into develop 2019-09-26 14:30:59 +08:00
lvxinran a2edf93d0a 公会战修改 2019-09-26 14:30:49 +08:00
lvxinran 8e87514b8f 无尽修改 2019-09-27 12:52:28 +08:00
lvxinran f708a2f546 公会战战力修改 2019-09-26 12:56:11 +08:00
lvxinran 494c3dbe17 公会战 2019-09-25 12:41:23 +08:00
lvxinran 0d24ba3784 公会战跨服 2019-09-24 12:45:56 +08:00
zhangshanxue d54dbb502f 占星优化 2019-09-24 11:09:16 +08:00
lvxinran 6cb28477c9 Merge branch 'develop' 2019-09-28 05:59:53 +08:00
wangyuan 08d695dd53 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-09-24 10:23:05 +08:00
wangyuan 90debb83e6 chat type 2019-09-24 10:22:30 +08:00
zhangshanxue aa12e2ecd0 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-24 10:21:36 +08:00
zhangshanxue 001bc4bedc 占星优化 2019-09-24 10:21:17 +08:00