From 4c11a6db16d8e31e49adb615b0a1fa9c5e8cf0e1 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Thu, 25 Nov 2021 16:34:50 +0800 Subject: [PATCH 1/2] log --- .../java/com/ljsd/jieling/logic/arena/CrossLingmaiLogic.java | 4 ++++ .../main/java/com/ljsd/jieling/thread/task/MinuteTask.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/CrossLingmaiLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/CrossLingmaiLogic.java index d193d7a64..a07da74f5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/CrossLingmaiLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/CrossLingmaiLogic.java @@ -194,14 +194,18 @@ public class CrossLingmaiLogic { //TODO 之后删除 public void fixBug(){ + LOGGER.error("lingmaimijing6"); //初始化数据 int crossGroup = GlobleSystemLogic.getInstence().getCrossGroup(); if (crossGroup == -1) { + LOGGER.error("lingmaifenzu:"+crossGroup); return; } Map lingMaiMap1 = RedisUtil.getInstence().getMapValues(RedisKey.CROSS_LINGMAISECRET_INFO, crossGroup + RedisKey.Delimiter_colon + 1, String.class, LingMaiSecretArea.class); Map lingMaiMap2 = RedisUtil.getInstence().getMapValues(RedisKey.CROSS_LINGMAISECRET_INFO, crossGroup + RedisKey.Delimiter_colon + 2, String.class, LingMaiSecretArea.class); + LOGGER.error("lingmaimijing4"); fixBugUpdateLingmaiData(lingMaiMap1,crossGroup,1); + LOGGER.error("lingmaimijing5"); fixBugUpdateLingmaiData(lingMaiMap2,crossGroup,2); LOGGER.error("lingmaimijing1"); //排行榜删除 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java index 410c8e3c8..ad5e07f57 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java @@ -337,7 +337,7 @@ public class MinuteTask extends Thread { //bug 修复 if(w==4){ - if(hour ==10 && minute ==20){ + if(hour ==10 && minute ==50){ LOGGER.error("lingmaimijing0 000000"); CrossLingmaiLogic.getInstance().fixBug(); } From 17e32849ae5b6007b80f1da1f37b64b4c89ebc01 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Thu, 25 Nov 2021 16:39:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=81=B5=E5=85=BD=E5=AE=9D=E9=98=81?= =?UTF-8?q?=E9=A2=86=E5=8F=96bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/logic/activity/AbstractActivity.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/AbstractActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/AbstractActivity.java index 0c226df3f..b279be07a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/AbstractActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/AbstractActivity.java @@ -176,14 +176,19 @@ public abstract class AbstractActivity implements IActivity, IEventHandler { SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(id); //up miss - int[][] reward = new int[1][2]; + int[][] reward=sActivityRewardConfig.getReward(); if(sGlobalActivity.getType() == ActivityType.SPECIAL_MONSTER_RANDOM_ACTIVITY) { + int[][] monReward = new int[1][2]; int summonId=activityMission.getActivityMissionMap().get(0).getProgrss(); if (summonId>0){ SSpiritAnimalSummon summonConfig=STableManager.getConfig(SSpiritAnimalSummon.class).get(summonId); - reward[0][0]=summonConfig.getOriginalItem(); - reward[0][1]=sActivityRewardConfig.getReward()[0][1]; + monReward[0][0]=summonConfig.getOriginalItem(); + monReward[0][1]=reward[0][1]; + }else{ + monReward[0][0]=reward[0][0]; + monReward[0][1]=reward[0][1]; } + reward=monReward; } CommonProto.Drop.Builder drop = ItemUtil.drop(user, reward, BIReason.TAKE_ACTIVITY_REWARD); checkAndSetProgress(activityMission, activityProgressInfo, missionId);