From e4aec66ae1a09d75580cfbaf9f4123e2a297d575 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Thu, 25 Nov 2021 17:46:20 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=B8=85=E7=A9=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=93=8D=E4=BD=9C?= 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 ad5e07f57..3c51b6934 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,12 +336,12 @@ public class MinuteTask extends Thread { } //bug 修复 - if(w==4){ + /*if(w==4){ if(hour ==10 && minute ==50){ LOGGER.error("lingmaimijing0 000000"); CrossLingmaiLogic.getInstance().fixBug(); } - } + }*/ } } } From 3b091987e9970fd1d30da6881b432bdf51dbada0 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Thu, 25 Nov 2021 18:37:14 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=B7=A8=E6=9C=8D=E7=81=B5=E8=84=89?= =?UTF-8?q?=E7=A7=98=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/crossServer/CrossLingmaiSecretAreaBattleHandler.java | 1 + 1 file changed, 1 insertion(+) 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 7eff9f92c..c13ee58a4 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 @@ -213,6 +213,7 @@ public class CrossLingmaiSecretAreaBattleHandler extends BaseHandler Date: Thu, 25 Nov 2021 19:17:21 +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 --- .../CrossLingmaiSecretAreaBattleHandler.java | 20 ++++++++++++++----- .../logic/arena/CrossLingmaiLogic.java | 5 ++++- 2 files changed, 19 insertions(+), 6 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 c13ee58a4..65d062e24 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 @@ -190,12 +190,14 @@ public class CrossLingmaiSecretAreaBattleHandler extends BaseHandler 10 ? 10 : ((TimeUtils.nowInt() - (int)myLingmai.getGetAwardTimeOrOccupyTime()) / 60); minute = ((TimeUtils.nowInt() - (int)myLingmai.getGetAwardTimeOrOccupyTime()) / 60); @@ -203,21 +205,29 @@ public class CrossLingmaiSecretAreaBattleHandler extends BaseHandler0){ - lingMaiSecretArea.setScore1((int) disappearScore); + Map lingMaiMap = RedisUtil.getInstence().getMapValues(RedisKey.CROSS_LINGMAISECRET_INFO, crossGroup + RedisKey.Delimiter_colon + group, String.class, LingMaiSecretArea.class); + if(!lingMaiMap.values().stream().anyMatch(n->n.getUid()!=uid)){ + lingMaiSecretArea.setScore1((int) disappearScore); + } } return lingMaiSecretArea; } From 7a6e9b1a2651197df2ad1a8db7c885e42c499d30 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Thu, 25 Nov 2021 19:25:33 +0800 Subject: [PATCH 4/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 --- .../java/com/ljsd/jieling/logic/arena/CrossLingmaiLogic.java | 2 +- 1 file changed, 1 insertion(+), 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 30413e1da..4b50ea88f 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 @@ -56,7 +56,7 @@ public class CrossLingmaiLogic { lingMaiSecretArea.setBeginOccupyTime(TimeUtils.nowInt()); if(disappearScore>0){ Map lingMaiMap = RedisUtil.getInstence().getMapValues(RedisKey.CROSS_LINGMAISECRET_INFO, crossGroup + RedisKey.Delimiter_colon + group, String.class, LingMaiSecretArea.class); - if(!lingMaiMap.values().stream().anyMatch(n->n.getUid()!=uid)){ + if(!lingMaiMap.values().stream().anyMatch(n->n.getUid()==uid)){ lingMaiSecretArea.setScore1((int) disappearScore); } } From ce85c5e94f17a059576493c487a8ea46838e1ffc Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Thu, 25 Nov 2021 20:42:11 +0800 Subject: [PATCH 5/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 --- .../CrossLingmaiSecretAreaBattleHandler.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 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 65d062e24..10cb87c0f 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 @@ -118,6 +118,7 @@ public class CrossLingmaiSecretAreaBattleHandler extends BaseHandler Date: Thu, 25 Nov 2021 11:02:27 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E8=B7=A8=E6=9C=8D=E7=81=B5=E8=84=89?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crossServer/CrossLingmaiSecretAreaBattleHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 10cb87c0f..9046d819b 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 @@ -210,8 +210,8 @@ public class CrossLingmaiSecretAreaBattleHandler extends BaseHandler 10 ? 10 : ((TimeUtils.nowInt() - (int)myLingmai.getGetAwardTimeOrOccupyTime()) / 60); minute = ((TimeUtils.nowInt() - (int)myLingmai.getGetAwardTimeOrOccupyTime()) / 60); - second =((TimeUtils.nowInt() - (int)oldOwner.getGetAwardTimeOrOccupyTime()) % 60) >60 ? - 60 : ((TimeUtils.nowInt() - (int)oldOwner.getGetAwardTimeOrOccupyTime()) % 60); + second =((TimeUtils.nowInt() - (int)myLingmai.getGetAwardTimeOrOccupyTime()) % 60) >60 ? + 60 : ((TimeUtils.nowInt() - (int)myLingmai.getGetAwardTimeOrOccupyTime()) % 60); LOGGER.info("uid:"+uid+"pvp owner occupy id:"+myLingmaiId+" minute:"+minute+"second:"+second); tempScore =(second*config.getRewardList()[0][1]/60); score1 = myLingmai.getScore1()+minute*config.getRewardList()[0][1]+(int)tempScore; From 15f2f5d6ed85b5339cdea6fe8c6107e7fc457022 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Thu, 25 Nov 2021 11:09:12 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crossServer/CrossLingmaiSecretAreaBattleHandler.java | 7 +++++++ 1 file changed, 7 insertions(+) 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 9046d819b..1008e465b 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 @@ -147,6 +147,13 @@ public class CrossLingmaiSecretAreaBattleHandler extends BaseHandler0){ + lingMaiSecretArea.setScore1((int) disappearScore); + } + } RedisUtil.getInstence().putMapEntry(RedisKey.CROSS_LINGMAISECRET_INFO, crossGroup + RedisKey.Delimiter_colon + group, String.valueOf(id), lingMaiSecretArea); } res.setResult(fightResult.getResult());