From 4722b7a07c480107d0c4fef243814c0ad03090d3 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Thu, 25 Nov 2021 14:24:23 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E7=81=B5=E5=85=BDbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CrossLingmaiSecretAreaBattleHandler.java | 4 +- .../logic/arena/CrossLingmaiLogic.java | 45 +++++++++++++++++++ .../ljsd/jieling/thread/task/MinuteTask.java | 7 ++- 3 files changed, 53 insertions(+), 3 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossLingmaiSecretAreaBattleHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossLingmaiSecretAreaBattleHandler.java index c9b4db4bd..7eff9f92c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossLingmaiSecretAreaBattleHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossLingmaiSecretAreaBattleHandler.java @@ -125,10 +125,10 @@ public class CrossLingmaiSecretAreaBattleHandler extends BaseHandler60 ? 60 : ((TimeUtils.nowInt() - (int)myLingmai.getGetAwardTimeOrOccupyTime()) % 60); - myLingmai.setScore1(myLingmai.getScore1() + minute*config.getRewardList()[0][1]+(second*(config.getRewardList()[0][1]/60))); + myLingmai.setScore1(myLingmai.getScore1() + minute*config.getRewardList()[0][1]+(second*config.getRewardList()[0][1]/60)); //myLingmai.setGetAwardTimeOrOccupyTime(TimeUtils.nowInt()); LOGGER.info("uid:"+uid+"first occupy myLingmaiId: "+myLingmaiId+" minute:"+minute+"second:"+second); - int score = myLingmai.getScore1() + config.getRewardList()[0][1] * myLingmai.getOccupyTime(); + int score = myLingmai.getScore1() + config.getRewardList()[0][1] * myLingmai.getOccupyTime()/60; rank = RankContext.getRankEnum(RankEnum.CROSS_LINGMAI_RANK_PERSON.getType()); rank.addRank(user.getId(), String.valueOf(crossGroup) + RedisKey.Delimiter_colon + group, score); //清除已有灵脉数据 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 9d76d2227..6e5549822 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 @@ -192,6 +192,51 @@ public class CrossLingmaiLogic { } } + //TODO 之后删除 + public void fixBug(){ + //初始化数据 + int crossGroup = GlobleSystemLogic.getInstence().getCrossGroup(); + if (crossGroup == -1) { + 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); + fixBugUpdateLingmaiData(lingMaiMap1,crossGroup,1); + fixBugUpdateLingmaiData(lingMaiMap2,crossGroup,2); + //排行榜删除 + String rkey1 = RedisUtil.getInstence().getKey(RedisKey.CROSS_LINGMAI_RANK_PERSON, Integer.toString(crossGroup) + RedisKey.Delimiter_colon + "1"); + String rkey2 = RedisUtil.getInstence().getKey(RedisKey.CROSS_LINGMAI_RANK_PERSON, Integer.toString(crossGroup) + RedisKey.Delimiter_colon + "2"); + RedisUtil.getInstence().del(rkey1); + RedisUtil.getInstence().del(rkey2); + } + + public static void fixBugUpdateLingmaiData(Map lingMaiMap,int crossGroup,int group) { + for (Map.Entry map : lingMaiMap.entrySet()) { + try{ + User user = UserManager.getUser(map.getValue().getUid()); + if (user != null) { + SLodeConfig config = SLodeConfig.lodeConfig.get(map.getValue().getId()); + if(config !=null){ + map.getValue().setGetAwardTimeOrOccupyTime(TimeUtils.nowInt()); + map.getValue().setBeginOccupyTime(TimeUtils.nowInt()); + map.getValue().setScore1(0); + map.getValue().setOccupyTime(0); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + } + RedisUtil.getInstence().putMapEntrys(RedisKey.CROSS_LINGMAISECRET_INFO, crossGroup + RedisKey.Delimiter_colon + group, lingMaiMap); + } + + + + + + + + public static class Instance { public final static CrossLingmaiLogic instance = new CrossLingmaiLogic(); 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 614483703..83ed556df 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 @@ -335,7 +335,12 @@ public class MinuteTask extends Thread { CrossLingmaiLogic.getInstance().initData(); } + //bug 修复 + if(w==2){ + if(hour ==10 && minute ==25){ + CrossLingmaiLogic.getInstance().fixBug(); + } + } } - } } From edb39cf2af025558c86b27560c0714cc9bbb4e33 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Thu, 25 Nov 2021 14:53:18 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=B7=A8=E6=9C=8D=E7=81=B5=E8=84=89bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 83ed556df..614a4ae96 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==2){ - if(hour ==10 && minute ==25){ + if(hour ==10 && minute ==50){ CrossLingmaiLogic.getInstance().fixBug(); } } From 4bfbad82543050d04eb3aa59e00aa684e8857c92 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Thu, 25 Nov 2021 15:15:33 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=B7=A8=E6=9C=8D=E7=81=B5=E8=84=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 614a4ae96..b7978243b 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==2){ - if(hour ==10 && minute ==50){ + if(hour ==9 && minute ==20){ CrossLingmaiLogic.getInstance().fixBug(); } } From 150742a64d7106441f6ccc908af20fb763e9ef61 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Thu, 25 Nov 2021 15:21:59 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E7=81=B5=E5=85=BD=E5=AE=9D=E9=98=81bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/activity/AbstractActivity.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 adb798721..0c226df3f 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,12 +176,13 @@ public abstract class AbstractActivity implements IActivity, IEventHandler { SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(id); //up miss - int[][] reward = sActivityRewardConfig.getReward(); + int[][] reward = new int[1][2]; if(sGlobalActivity.getType() == ActivityType.SPECIAL_MONSTER_RANDOM_ACTIVITY) { 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]; } } CommonProto.Drop.Builder drop = ItemUtil.drop(user, reward, BIReason.TAKE_ACTIVITY_REWARD); From a9cbf7a0466a0439ba6029eef7e29e94fbaa9d52 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Thu, 25 Nov 2021 15:39:09 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/arena/CrossLingmaiLogic.java | 4 ++++ .../main/java/com/ljsd/jieling/thread/task/MinuteTask.java | 3 ++- 2 files changed, 6 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 6e5549822..d193d7a64 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 @@ -203,11 +203,14 @@ public class CrossLingmaiLogic { Map lingMaiMap2 = RedisUtil.getInstence().getMapValues(RedisKey.CROSS_LINGMAISECRET_INFO, crossGroup + RedisKey.Delimiter_colon + 2, String.class, LingMaiSecretArea.class); fixBugUpdateLingmaiData(lingMaiMap1,crossGroup,1); fixBugUpdateLingmaiData(lingMaiMap2,crossGroup,2); + LOGGER.error("lingmaimijing1"); //排行榜删除 String rkey1 = RedisUtil.getInstence().getKey(RedisKey.CROSS_LINGMAI_RANK_PERSON, Integer.toString(crossGroup) + RedisKey.Delimiter_colon + "1"); String rkey2 = RedisUtil.getInstence().getKey(RedisKey.CROSS_LINGMAI_RANK_PERSON, Integer.toString(crossGroup) + RedisKey.Delimiter_colon + "2"); RedisUtil.getInstence().del(rkey1); + LOGGER.error("lingmaimijing2"+rkey1); RedisUtil.getInstence().del(rkey2); + LOGGER.error("lingmaimijing3"+rkey2); } public static void fixBugUpdateLingmaiData(Map lingMaiMap,int crossGroup,int group) { @@ -219,6 +222,7 @@ public class CrossLingmaiLogic { if(config !=null){ map.getValue().setGetAwardTimeOrOccupyTime(TimeUtils.nowInt()); map.getValue().setBeginOccupyTime(TimeUtils.nowInt()); + LOGGER.error("lingmaimijing1"); map.getValue().setScore1(0); map.getValue().setOccupyTime(0); } 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 b7978243b..f6d550be5 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,8 @@ public class MinuteTask extends Thread { //bug 修复 if(w==2){ - if(hour ==9 && minute ==20){ + if(hour ==9 && minute ==40){ + LOGGER.error("lingmaimijing0 000000"); CrossLingmaiLogic.getInstance().fixBug(); } } From 80603a4de5088728bcc4c34b8065128528774249 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Thu, 25 Nov 2021 16:06:31 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E8=B7=A8=E6=9C=8D=E7=81=B5=E8=84=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/thread/task/MinuteTask.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 f6d550be5..410c8e3c8 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 @@ -336,8 +336,8 @@ public class MinuteTask extends Thread { } //bug 修复 - if(w==2){ - if(hour ==9 && minute ==40){ + if(w==4){ + if(hour ==10 && minute ==20){ LOGGER.error("lingmaimijing0 000000"); CrossLingmaiLogic.getInstance().fixBug(); } From 4c462a99dc00b8df74f3c74646b12185048831bd Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Thu, 25 Nov 2021 16:19:59 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E7=81=B5=E5=85=BD=E6=8A=BD=E5=A5=96?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index f0182db4f..ea4f6f898 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -437,7 +437,11 @@ public class HeroLogic { } //记录卡池抽奖次数 heroManager.putRandomType(type, num + result[1]); - return result; + int[]rewardArr=new int[result.length]; + for (int i = 0; i < result.length; i++) { + rewardArr[i]=result[i]; + } + return rewardArr; } @@ -696,6 +700,7 @@ public class HeroLogic { } } + ///灵兽抽奖替换高级奖励 private void changeRandomItem(User user, int activityId, int[][] random) { ActivityMission activityMission = user.getActivityManager().getActivityMissionMap().get(activityId); if (activityMission == null || activityMission.getActivityMissionMap().get(0) == null) {