From 5f335130c9e1687a75ff134d661f4f37ce931d14 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Wed, 31 Mar 2021 09:13:49 +0800 Subject: [PATCH 1/4] merge --- .../activity/RemoveEventHeroHandler.java | 4 ++- .../logic/family/GuildChallengeLogic.java | 26 +++++++++++++++++-- .../jieling/logic/store/BuyGoodsLogic.java | 2 ++ 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RemoveEventHeroHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RemoveEventHeroHandler.java index 47319f3eb..127735ec5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RemoveEventHeroHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RemoveEventHeroHandler.java @@ -27,7 +27,9 @@ public class RemoveEventHeroHandler implements IEventHandler{ } Hero hero = userInMem.getHeroManager().getHeroMap().get(heroId); Map equipMap = userInMem.getEquipManager().getEquipMap(); - hero.getEquipByPositionMap().values().forEach(equip->equipMap.get(equip).setHeroId("")); + hero.getEquipByPositionMap().values().forEach(equip-> { + equipMap.get(String.valueOf(equip)).setHeroId(""); + }); Map endlessHeroInfo = userInMem.getMapManager().getEndlessMapInfo().getEndlessHeroInfo(); if(endlessHeroInfo!=null && endlessHeroInfo.containsKey(heroId)){ endlessHeroInfo.remove(heroId); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java index fc4a3f955..af0334e8f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java @@ -322,9 +322,28 @@ public class GuildChallengeLogic { } Family.GuildChallengeIndication.Builder indication = Family.GuildChallengeIndication.newBuilder() .setBlood(remainHp) - .setCurBoss(guildInfo.getCurrBossId()); - GuildLogic.sendIndicationToMemberWithoutUser(guildInfo, MessageTypeProto.MessageType.GUILD_CHALLENGE_INDICATION,indication.build(),uid); +// GuildLogic.sendIndicationToMemberWithoutUser(guildInfo, MessageTypeProto.MessageType.GUILD_CHALLENGE_INDICATION,indication.build(),uid); + Map> members = guildInfo.getMembers(); + for(Set items : members.values()){ + for(Integer sendUid : items){ + //把自己跳过,自己的特殊处理 + if(sendUid==uid){ + continue; + } + ISession isession = OnlineUserManager.getSessionByUid(sendUid); + Family.GuildChallengeIndication.Builder otherIndication = Family.GuildChallengeIndication.newBuilder() + .setBlood(remainHp) + .setCurBoss(guildInfo.getCurrBossId()); + if(kill==1&&!UserManager.getUser(sendUid).getGuildMyInfo().getRefreshedBoss().contains(bossId)&&guildInfo.getBossHpRemain()!=-1){ + otherIndication.setIsRefresh(1);//需要前端刷新次数 + } + if(isession!=null){ +// LOGGER.info("向{}发送indication",sendUid); + MessageUtil.sendIndicationMessage(isession,1,MessageTypeProto.MessageType.GUILD_CHALLENGE_INDICATION_VALUE,otherIndication.build(),true); + } + } + } indication.setIsKill(kill); //伤害排行 @@ -350,6 +369,9 @@ public class GuildChallengeLogic { PlayerLogic.getInstance().checkAndUpdate(user,config.getPrivilege()[0],1); MessageUtil.sendMessage(session,1,messageType.getNumber(),response.build(),true); + if(kill==1&&!UserManager.getUser(uid).getGuildMyInfo().getRefreshedBoss().contains(bossId)&&guildInfo.getBossHpRemain()!=-1){ + indication.setIsRefresh(1);//需要前端刷新次数 + } MessageUtil.sendIndicationMessage(session,1,MessageTypeProto.MessageType.GUILD_CHALLENGE_INDICATION_VALUE,indication.build(),true); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java index abd389485..e1af070bf 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java @@ -278,7 +278,9 @@ public class BuyGoodsLogic { // if(rechargeInfo.getIsFirst()==0 && firstInvest == 1){ // ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.FirstRecharge,sRechargeCommodityConfig.getPrice()); // SActivityRewardConfig sActivityRewardConfig = SActivityRewardConfig.getsActivityRewardConfigByActivityId(4).get(0); + if(sRechargeCommodityConfig.getPrice()!=0&&price!=0){ rechargeInfo.setFirst(1); + } // String title = SErrorCodeEerverConfig.getI18NMessage("recharge_first_title"); // String content = SErrorCodeEerverConfig.getI18NMessage("recharge_first_txt"); // MailLogic.getInstance().sendMail(user.getId(),title,content,ItemUtil.getMailReward(sActivityRewardConfig.getReward()),nowTime, Global.MAIL_EFFECTIVE_TIME); From 2b06894b07757f9cd82ee7278053efb4b30424d2 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Tue, 23 Mar 2021 03:30:42 +0800 Subject: [PATCH 2/4] merge2 --- .../logic/family/GuildChallengeLogic.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java index af0334e8f..ec5dd8f26 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java @@ -25,6 +25,8 @@ import com.ljsd.jieling.logic.rank.rankImpl.AbstractRank; import com.ljsd.jieling.logic.store.StoreLogic; import com.ljsd.jieling.network.server.ProtocolsManager; import com.ljsd.jieling.network.session.ISession; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import rpc.protocols.CommonProto; import rpc.protocols.Family; import rpc.protocols.MessageTypeProto; @@ -46,6 +48,7 @@ import java.util.concurrent.ConcurrentHashMap; */ public class GuildChallengeLogic { + private static final Logger LOGGER = LoggerFactory.getLogger(GuildChallengeLogic.class); public static GuildChallengeLogic getInstance() { return Instance.instance; } @@ -322,7 +325,11 @@ public class GuildChallengeLogic { } Family.GuildChallengeIndication.Builder indication = Family.GuildChallengeIndication.newBuilder() .setBlood(remainHp) +<<<<<<< HEAD +======= + .setCurBoss(guildInfo.getCurrBossId()); +>>>>>>> 4c0ce0872... 工会副本修改 // GuildLogic.sendIndicationToMemberWithoutUser(guildInfo, MessageTypeProto.MessageType.GUILD_CHALLENGE_INDICATION,indication.build(),uid); Map> members = guildInfo.getMembers(); for(Set items : members.values()){ @@ -332,6 +339,7 @@ public class GuildChallengeLogic { continue; } ISession isession = OnlineUserManager.getSessionByUid(sendUid); +<<<<<<< HEAD Family.GuildChallengeIndication.Builder otherIndication = Family.GuildChallengeIndication.newBuilder() .setBlood(remainHp) .setCurBoss(guildInfo.getCurrBossId()); @@ -341,6 +349,14 @@ public class GuildChallengeLogic { if(isession!=null){ // LOGGER.info("向{}发送indication",sendUid); MessageUtil.sendIndicationMessage(isession,1,MessageTypeProto.MessageType.GUILD_CHALLENGE_INDICATION_VALUE,otherIndication.build(),true); +======= + if(kill==1&&!UserManager.getUser(sendUid).getGuildMyInfo().getRefreshedBoss().contains(bossId)&&guildInfo.getBossHpRemain()!=-1){ + indication.setIsRefresh(1);//需要前端刷新次数 + } + if(isession!=null){ + LOGGER.info("向{}发送indication",sendUid); + MessageUtil.sendIndicationMessage(isession,1,MessageTypeProto.MessageType.GUILD_CHALLENGE_INDICATION_VALUE,indication.build(),true); +>>>>>>> 4c0ce0872... 工会副本修改 } } } From 4fa6b8e8af10e82d3dd4faabb823550e6aa1419a Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sat, 27 Mar 2021 16:43:49 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=86=B2=E7=AA=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/family/GuildChallengeLogic.java | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java index ec5dd8f26..c7039424f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java @@ -325,11 +325,7 @@ public class GuildChallengeLogic { } Family.GuildChallengeIndication.Builder indication = Family.GuildChallengeIndication.newBuilder() .setBlood(remainHp) -<<<<<<< HEAD - -======= .setCurBoss(guildInfo.getCurrBossId()); ->>>>>>> 4c0ce0872... 工会副本修改 // GuildLogic.sendIndicationToMemberWithoutUser(guildInfo, MessageTypeProto.MessageType.GUILD_CHALLENGE_INDICATION,indication.build(),uid); Map> members = guildInfo.getMembers(); for(Set items : members.values()){ @@ -339,7 +335,6 @@ public class GuildChallengeLogic { continue; } ISession isession = OnlineUserManager.getSessionByUid(sendUid); -<<<<<<< HEAD Family.GuildChallengeIndication.Builder otherIndication = Family.GuildChallengeIndication.newBuilder() .setBlood(remainHp) .setCurBoss(guildInfo.getCurrBossId()); @@ -349,14 +344,6 @@ public class GuildChallengeLogic { if(isession!=null){ // LOGGER.info("向{}发送indication",sendUid); MessageUtil.sendIndicationMessage(isession,1,MessageTypeProto.MessageType.GUILD_CHALLENGE_INDICATION_VALUE,otherIndication.build(),true); -======= - if(kill==1&&!UserManager.getUser(sendUid).getGuildMyInfo().getRefreshedBoss().contains(bossId)&&guildInfo.getBossHpRemain()!=-1){ - indication.setIsRefresh(1);//需要前端刷新次数 - } - if(isession!=null){ - LOGGER.info("向{}发送indication",sendUid); - MessageUtil.sendIndicationMessage(isession,1,MessageTypeProto.MessageType.GUILD_CHALLENGE_INDICATION_VALUE,indication.build(),true); ->>>>>>> 4c0ce0872... 工会副本修改 } } } From 1b472203e777b0174d48724f176d73323584f382 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sat, 27 Mar 2021 18:45:00 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8A=A5=E9=94=99=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/handler/map/MapLogic.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index 49336f1c6..4942a217a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -1332,7 +1332,7 @@ public class MapLogic { .newBuilder() .setResult(resultCode) .setEnventDrop(dropBuilder) - .addAllRemainHpList(remainHp) +// .addAllRemainHpList(remainHp) .setEssenceValue(mapManager.getTrialInfo().getEnergy()) .setLastXY(mapManager.getLastXY()) .build(); @@ -1384,7 +1384,7 @@ public class MapLogic { } fastFightResponse.setEnventDrop(drop.build()); fastFightResponse.setResult(resultCode); - fastFightResponse.addAllRemainHpList(remainHp); +// fastFightResponse.addAllRemainHpList(remainHp); fastFightResponse.setEssenceValue(mapManager.getTrialInfo().getEnergy()); fastFightResponse.build();