From 410427b26837df84a5a9529d2043259ee7248ed4 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Thu, 10 Oct 2019 11:48:30 +0800 Subject: [PATCH] fix main level fight --- .../jieling/logic/activity/FightMainEventHandler.java | 4 ++-- .../jieling/logic/activity/UserLevelEventHandler.java | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/FightMainEventHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/FightMainEventHandler.java index 8118ca8a3..64a80e66d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/FightMainEventHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/FightMainEventHandler.java @@ -34,11 +34,11 @@ public class FightMainEventHandler implements IEventHandler{ if(sGlobalSystemConfigs == null){ return; } + int uid = fightMainEvent.getUid(); + User user = UserManager.getUser(uid); for(SGlobalSystemConfig sGlobalSystemConfig : sGlobalSystemConfigs){ int[][] openGifts = sGlobalSystemConfig.getOpenGifts(); if(openGifts!=null && openGifts.length>0){ - int uid = fightMainEvent.getUid(); - User user = UserManager.getUser(uid); ItemUtil.drop(user,openGifts, BIReason.SYSTERM_OPEN_REWARD); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/UserLevelEventHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/UserLevelEventHandler.java index 856002500..5c813a00b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/UserLevelEventHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/UserLevelEventHandler.java @@ -23,6 +23,12 @@ public class UserLevelEventHandler implements IEventHandler{ return; UserLevelEvent userLevelEvent = (UserLevelEvent) event; int level = userLevelEvent.getLevel(); + int uid = userLevelEvent.getUid(); + User user = UserManager.getUser(uid); + int state = user.getMainLevelManager().getState(); + if(state == -1){ + user.getMainLevelManager().setState(1); + } List sGlobalSystemConfigs = SGlobalSystemConfig.sGlobalSystemConfigMapByTypeAndConditionMap.get(2).get(level); if(sGlobalSystemConfigs == null){ return; @@ -30,8 +36,6 @@ public class UserLevelEventHandler implements IEventHandler{ for(SGlobalSystemConfig sGlobalSystemConfig : sGlobalSystemConfigs){ int[][] openGifts = sGlobalSystemConfig.getOpenGifts(); if(openGifts!=null && openGifts.length>0){ - int uid = userLevelEvent.getUid(); - User user = UserManager.getUser(uid); ItemUtil.drop(user,openGifts, BIReason.SYSTERM_OPEN_REWARD); } }