Commit Graph

2399 Commits (5fb0071318ff517339cddd83191f20d3793b5968)
 

Author SHA1 Message Date
lvxinran 5fb0071318 戒灵秘宝等级推送删除 2019-10-16 13:53:20 +08:00
zhangshanxue aa2d6d0648 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-16 11:25:07 +08:00
zhangshanxue a2ac1eaf28 跑马灯 2019-10-16 11:25:03 +08:00
zhangshanxue 146444119f 排行榜判null 2019-10-16 11:23:56 +08:00
lvxinran c0a0514fe7 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-16 10:20:59 +08:00
lvxinran b3e6d44a8b 邮件获取修改 2019-10-16 10:20:54 +08:00
lvxinran a2b6955507 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-17 01:01:02 +08:00
lvxinran 164a3cb45f 头像提交 2019-10-17 01:00:57 +08:00
wangyuan 46e26c9959 view hero detail 2019-10-15 16:53:08 +08:00
wangyuan 589138f8a1 view team info 2019-10-15 16:15:08 +08:00
wangyuan d5b455eb27 view team details 2019-10-15 14:31:54 +08:00
wangyuan 8f34ad884a fix activity 2019-10-15 10:22:08 +08:00
wangyuan 8a4efef55c fix open 2019-10-14 20:00:27 +08:00
wangyuan 539c43c50e extra drop 2019-10-14 19:59:00 +08:00
lvxinran c87de8e301 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-14 18:09:25 +08:00
lvxinran 29b7f592e8 公会战修改 2019-10-14 18:08:44 +08:00
lvxinran c70b7b17ef 邮件修改 2019-10-15 08:08:14 +08:00
wangyuan a3eed6219f store close 2019-10-14 17:27:03 +08:00
wangyuan f531fd85d6 fix store open 2019-10-14 17:17:25 +08:00
wangyuan 2acbce61b4 fix store 2019-10-14 16:32:30 +08:00
wangyuan f246d8ce74 set level 2019-10-14 15:54:19 +08:00
wangyuan b83aa4b27a fix 2019-10-14 15:32:58 +08:00
wangyuan 94ac2788df change classloader 2019-10-14 15:30:13 +08:00
lvxinran 8851b2e725 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-14 07:14:10 +08:00
zhangshanxue 29c2042d70 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-30 16:38:12 +08:00
zhangshanxue 847740bfad 充值活动 2019-10-30 16:38:01 +08:00
lvxinran 5c554fec56 控制服务器公会战加入 2019-10-14 07:13:46 +08:00
lvxinran 759488f99f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-14 05:22:38 +08:00
lvxinran e8f10f1f04 戒灵秘宝,公会修改 2019-10-14 05:20:05 +08:00
lvxinran a4bed99395 配置回滚 2019-10-13 06:23:58 +08:00
lvxinran c007ac7f3b 公会修改 2019-10-13 06:13:37 +08:00
lvxinran e5f1007862 戒灵秘宝周刷新修改 2019-10-25 05:05:31 +08:00
lvxinran 6983bb86de 修改任务 2019-10-22 03:01:17 +08:00
lvxinran 89ac91c01b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-22 02:53:11 +08:00
lvxinran 4ca3c49ffe 戒灵秘宝开始前重置 2019-10-22 02:53:02 +08:00
zhangshanxue 36e7bca253 血战配置 2019-10-12 15:30:13 +08:00
zhangshanxue e009ee3191 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-12 15:24:24 +08:00
zhangshanxue 7a228f968e 血战配置 2019-10-12 15:22:11 +08:00
zhangshanxue 467024e9bb Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-11 19:09:49 +08:00
zhangshanxue 6e6bb5550c 幸运探宝 2019-10-11 19:09:44 +08:00
wangyuan 060e6f1ad3 一键移除 2019-10-11 18:29:16 +08:00
wangyuan 823d0176ce fix fight data 2019-10-11 18:13:16 +08:00
zhangshanxue c9f2e3514d 静态配置 2019-10-11 17:28:45 +08:00
zhangshanxue c3aa2c15f7 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-11 16:55:54 +08:00
lvxinran 9476a9b529 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-21 09:45:04 +08:00
lvxinran 28ca7043c7 邮件优化 2019-10-21 09:44:56 +08:00
lvxinran c588030e47 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-14 05:08:41 +08:00
lvxinran 7bfa624269 周刷新 2019-10-14 05:08:20 +08:00
zhangshanxue fb33d6bdb6 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/config/SRechargeCommodityConfig.java
#	serverlogic/src/main/java/com/ljsd/jieling/config/SSpecialConfig.java
#	serverlogic/src/main/java/com/ljsd/jieling/config/STreasureTaskConfig.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/UserLevelEventHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java
2019-10-11 16:55:39 +08:00
zhangshanxue 85996ead41 工具模块 配置模块提取 热更新优化 2019-10-11 16:32:20 +08:00