diff --git a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_training.java b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_training.java index 4a582147f..001eb5123 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_training.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_training.java @@ -4,20 +4,21 @@ import com.ljsd.jieling.logic.dao.Hero; import com.ljsd.jieling.logic.dao.Training; import com.ljsd.jieling.logic.dao.root.User; -//training uid heroId lv +import java.util.Map; + +//training uid lv public class Cmd_training extends GmRoleAbstract { @Override public boolean exec(String[] args) throws Exception { - String heroId = args[0]; - int lv = Integer.parseInt(args[1]); - + int lv = Integer.parseInt(args[0]); User user = getUser(); - Hero hero = user.getHeroManager().getHero(heroId); - Training training = hero.getTraining(); - training.setLv(lv); - hero.setTraining(training); - + Map heroMap = user.getHeroManager().getHeroMap(); + for (Hero hero : heroMap.values()) { + Training training = hero.getTraining(); + training.setLv(lv); + hero.setTraining(training); + } return true; } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ContinuousGiftActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ContinuousGiftActivity.java index e1e3446ec..277dcc791 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ContinuousGiftActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ContinuousGiftActivity.java @@ -87,6 +87,7 @@ public class ContinuousGiftActivity extends AbstractActivity { Collection themeShops = SThemeActivityShop.themeMap.getOrDefault(id, new HashMap<>(0)).values(); for (SThemeActivityShop theme : themeShops) { + LOGGER.info("连续礼包活动日志,acid:{},uid:{},giftid:{},num:{},themeid:{},themegiftid:{},themetype:{}",id,user.getId(),giftId,giftNum,theme.getId(),theme.getGoodId(),theme.getGoodType()); if (theme.getGoodId() == giftId && theme.getGoodType() == type){ // 记录礼包购买次数 ActivityProgressInfo current = missionMap.getOrDefault(theme.getId(),new ActivityProgressInfo()); @@ -94,8 +95,8 @@ public class ContinuousGiftActivity extends AbstractActivity { // 当前礼包状态处理 if (checkBuyGiftLimit(user,theme.getId(),current.getProgrss())){ current.setState(8); - missionMap.put(theme.getId(),current); } + missionMap.put(theme.getId(),current); break; } }