From 1102c86448beb065f842cb63e0da1b32aafeec1b Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sat, 10 Apr 2021 14:27:04 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=BD=A6=E8=BF=9F=E6=96=97=E6=B3=95?= =?UTF-8?q?=E9=97=B4=E9=9A=94=E6=97=B6=E9=97=B4=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/handler/FastChallengeHandler.java | 1 + 1 file changed, 1 insertion(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/FastChallengeHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/FastChallengeHandler.java index 5c38c2586..338efd42c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/FastChallengeHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/FastChallengeHandler.java @@ -144,6 +144,7 @@ public class FastChallengeHandler extends BaseHandler Date: Mon, 12 Apr 2021 23:32:38 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=82=AE=E4=BB=B6=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/mail/MailLogic.java | 9 ++++++--- .../main/java/com/ljsd/jieling/util/CBean2Proto.java | 10 ++++++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mail/MailLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mail/MailLogic.java index 8a849c89f..75cf4e436 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mail/MailLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mail/MailLogic.java @@ -185,7 +185,7 @@ public class MailLogic { private void getAllMailProtoList(List cMailList, List mailList) { for (Mail mail :cMailList){ - mailList.add(CBean2Proto.getMail(mail)); + mailList.add(CBean2Proto.getMailWithoutContent(mail)); } } @@ -203,11 +203,14 @@ public class MailLogic { mail.setState(Global.MAIL_STATE_READ); mail.setNoUseDeleteTime(TimeUtils.now()+TimeUtils.DAY*Global.MAIL_NOUSE_DELETE_TIME); }else{ - mail.setState(Global.MAIL_DRAW_ST_UNGET); + if(mail.getState()!=Global.MAIL_DRAW_ST_GOT){ + mail.setState(Global.MAIL_DRAW_ST_UNGET); + } } mailManager.addMail(mail); ReportUtil.onReportEvent(user, ReportEventEnum.OPEN_MAIL.getType()); - MessageUtil.sendMessage(iSession, 1,msgId, null, true); + PlayerInfoProto.MailReadResponse.Builder builder = PlayerInfoProto.MailReadResponse.newBuilder().setMailInfo(CBean2Proto.getMail(mail, false)); + MessageUtil.sendMessage(iSession, 1,msgId, builder.build(), true); } /** diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java index 43d5b32a3..b61cb7d8c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -240,22 +240,28 @@ public class CBean2Proto { .build(); }*/ - public static CommonProto.Mail getMail(Mail mail){ + public static CommonProto.Mail getMail(Mail mail,boolean withOutContent){ CommonProto.Mail.Builder mailProto = CommonProto.Mail .newBuilder() .setMailId(mail.getId()) .setHead(mail.getHead()) - .setContent(mail.getContent()) .setState(mail.getState()) .setEffectiveTime(mail.getEffectiveTime()) .setSendTime(mail.getSendTime()) .setSendName(mail.getSendName()) .setMailType(mail.getMailType()); + + if(!withOutContent){ + mailProto.setContent(mail.getContent()); + } if(mail.getMailItem()!=null){ mailProto.setMailItem(mail.getMailItem()); } return mailProto.build(); } + public static CommonProto.Mail getMailWithoutContent(Mail mail){ + return getMail(mail,true); + } public static CommonProto.Equip getEquipProto(PropertyItem equip){ From 153c9d618ead96c9c2ab02a80dfe130dc2ecce22 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sat, 10 Apr 2021 23:43:56 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 9 +++++++++ .../src/main/java/com/ljsd/jieling/util/CBean2Proto.java | 2 ++ 2 files changed, 11 insertions(+) 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 6baa6b95b..709142b2a 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 @@ -1673,14 +1673,23 @@ public class HeroLogic{ } //玩家皮肤加成 for(Map.Entry entry : user.getPlayerInfoManager().getUserSkinValidTime().entrySet()){ + if(SPlayerHeadIcon.getHeadIconMap().containsKey(entry.getKey())){ + continue; + } combinedAttribute(SPlayerHeadIcon.getHeadIconMap().get(entry.getKey()).getUnlockProperty(),heroAllAttribute); } //玩家称号加成 for(Map.Entry entry : user.getPlayerInfoManager().getUserTitleValidTime().entrySet()){ + if(SPlayerHeadIcon.getHeadIconMap().containsKey(entry.getKey())){ + continue; + } combinedAttribute(SPlayerHeadIcon.getHeadIconMap().get(entry.getKey()).getUnlockProperty(),heroAllAttribute); } //玩家坐骑加成 for(Map.Entry entry : user.getPlayerInfoManager().getUserMountValidTime().entrySet()){ + if(SPlayerHeadIcon.getHeadIconMap().containsKey(entry.getKey())){ + continue; + } combinedAttribute(SPlayerHeadIcon.getHeadIconMap().get(entry.getKey()).getUnlockProperty(),heroAllAttribute); } //装备总战力评分 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java index b61cb7d8c..4136d3b10 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -119,6 +119,8 @@ public class CBean2Proto { List userSkinLists = new ArrayList<>(); // 获取玩家已使用皮肤列表 Map validTime = user.getPlayerInfoManager().getUserSkinValidTime(); + user.getPlayerInfoManager().removeUserSkinValidTime(0); + long now = TimeUtils.now() / 1000; From b9503983ba11f527858f266217ee7119192fec3a Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sun, 11 Apr 2021 00:00:05 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=8A=A5=E7=A9=BA=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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 709142b2a..494ab939f 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 @@ -1673,21 +1673,21 @@ public class HeroLogic{ } //玩家皮肤加成 for(Map.Entry entry : user.getPlayerInfoManager().getUserSkinValidTime().entrySet()){ - if(SPlayerHeadIcon.getHeadIconMap().containsKey(entry.getKey())){ + if(!SPlayerHeadIcon.getHeadIconMap().containsKey(entry.getKey())){ continue; } combinedAttribute(SPlayerHeadIcon.getHeadIconMap().get(entry.getKey()).getUnlockProperty(),heroAllAttribute); } //玩家称号加成 for(Map.Entry entry : user.getPlayerInfoManager().getUserTitleValidTime().entrySet()){ - if(SPlayerHeadIcon.getHeadIconMap().containsKey(entry.getKey())){ + if(!SPlayerHeadIcon.getHeadIconMap().containsKey(entry.getKey())){ continue; } combinedAttribute(SPlayerHeadIcon.getHeadIconMap().get(entry.getKey()).getUnlockProperty(),heroAllAttribute); } //玩家坐骑加成 for(Map.Entry entry : user.getPlayerInfoManager().getUserMountValidTime().entrySet()){ - if(SPlayerHeadIcon.getHeadIconMap().containsKey(entry.getKey())){ + if(!SPlayerHeadIcon.getHeadIconMap().containsKey(entry.getKey())){ continue; } combinedAttribute(SPlayerHeadIcon.getHeadIconMap().get(entry.getKey()).getUnlockProperty(),heroAllAttribute); From 6742b70568dcd435371c7fbd2e4472d4e2d87baf Mon Sep 17 00:00:00 2001 From: lvxinran Date: Mon, 12 Apr 2021 17:13:38 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java index bb4a54c08..91cb6940d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java @@ -359,7 +359,7 @@ public class GuildLogic { } //todo 判读人数是否已达上限 if(guildInfo.getTotalMembers()>=STableManager.getConfig(SGuildLevelConfig.class).get(guildInfo.getLevel()).getNum()){ - throw new ErrorCodeException(ErrorCode.newDefineCode("该工会人数已达上限")); + throw new ErrorCodeException(ErrorCode.FAMILY_MAX); } boolean isSuccess = RedisUtil.getInstence().tryGetDistributedLock(RedisKey.OPERATE_FAMILY, Integer.toString(guildId), Integer.toString(uid), 500); if(!isSuccess){