From 5fb5901b47be7a754cdb0f88a075656d3c7f3439 Mon Sep 17 00:00:00 2001 From: grimm <1769111741@qq.com> Date: Tue, 16 Jan 2024 14:37:28 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=BF=9E=E7=BB=AD=E8=B4=AD=E4=B9=B0?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/logic/activity/ContinuousGiftActivity.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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..234b897b6 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; } } From cff23b5715b16d7126dfb76f4d6179a405847e70 Mon Sep 17 00:00:00 2001 From: grimm <1769111741@qq.com> Date: Tue, 16 Jan 2024 15:06:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=BF=9E=E7=BB=AD=E8=B4=AD=E4=B9=B0?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/activity/ContinuousGiftActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 234b897b6..f5d9882e9 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,7 +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()); + 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()); From 5101384e3b964fc5072aa09cf95337e83e424d5b Mon Sep 17 00:00:00 2001 From: grimm <1769111741@qq.com> Date: Tue, 16 Jan 2024 15:08:59 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=BF=9E=E7=BB=AD=E8=B4=AD=E4=B9=B0?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/activity/ContinuousGiftActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f5d9882e9..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,7 +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()); + 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()); From fe5bed800abefa30256ece56382b9ffd69014848 Mon Sep 17 00:00:00 2001 From: grimm <1769111741@qq.com> Date: Tue, 16 Jan 2024 16:18:45 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=89=B9=E8=AE=ADgm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/kefu/Cmd_training.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) 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; } }