From 68a935cfb6762519f877fef050ee9fea15324c80 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Thu, 10 Jun 2021 17:14:59 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=B1=B1=E6=B2=B3=E7=A4=BE=E7=A8=B7?= =?UTF-8?q?=E5=9B=BE=E5=A5=96=E5=8A=B1=E6=8E=92=E5=BA=8F=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/hardStage/HardStageChapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hardStage/HardStageChapter.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hardStage/HardStageChapter.java index 0fbb180b5..d131308ef 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hardStage/HardStageChapter.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hardStage/HardStageChapter.java @@ -12,7 +12,7 @@ public class HardStageChapter extends MongoBase { private int stars; - private Map rewardMap = new TreeMap<>(); + private Map rewardMap = new HashMap<>(); public int getChapterId() { return chapterId; From cf5f93ec7d926730736671db93715c8bee9c1496 Mon Sep 17 00:00:00 2001 From: mengchengzhen <13682025901@163.com> Date: Thu, 10 Jun 2021 17:38:56 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=A6=8F=E5=88=A9=E7=BA=A2=E5=8C=85?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/family/GuildLogic.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 18a409d3f..b28623ecf 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 @@ -1281,9 +1281,7 @@ public class GuildLogic { public static void sendWelfareRedPacketInfo(User user){ Map redPacketsMap = user.getPlayerInfoManager().getWelfareRedPackets(); - if(redPacketsMap.size() == 0){//初始化 - initWelfareRedPacketInfo(user); - } + initWelfareRedPacketInfo(user); PlayerInfoProto.WelfareRedPacketPush.Builder build = PlayerInfoProto.WelfareRedPacketPush.newBuilder(); for(Map.Entry entry : redPacketsMap.entrySet()){ if(entry.getValue() >= 0){ @@ -1312,6 +1310,8 @@ public class GuildLogic { public static void initWelfareRedPacketInfo(User user){ Map redPacketsMap = user.getPlayerInfoManager().getWelfareRedPackets(); for(SGuildRedPackConfig config : SGuildRedPackConfig.sWelfareRedPackByRule.values()){ + if(redPacketsMap.containsKey(config.getId())) + continue; if(config.getRuleType() == 3){ if(config.getGroupId() == 2){ int num = user.getMapManager().getLastMonsterAttack(); From 5a88bd3ebb7e9f191d425f237995db88746d7ccb Mon Sep 17 00:00:00 2001 From: mengchengzhen <13682025901@163.com> Date: Thu, 10 Jun 2021 18:05:56 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=A6=8F=E5=88=A9=E7=BA=A2=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/family/GuildLogic.java | 8 ++++---- .../logic/redpacket/WelfareRedPackSendHandler.java | 2 +- .../src/main/java/config/SGuildRedPackConfig.java | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) 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 b28623ecf..7b15d6d9f 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 @@ -1185,7 +1185,7 @@ public class GuildLogic { if(redPacket.getRuleType() != 1){ map.put(redId,-1); if(redPacket.getRuleType() == 3){ - openNext(map,redPacket.getGroupId(),redId); + openNext(map,redPacket.getRuleId()[0],redId); } }else{ map.put(redId,old-1); @@ -1247,7 +1247,7 @@ public class GuildLogic { } break; case 3: - List serise = SGuildRedPackConfig.welfareRedPackBySerise.get(config.getGroupId()); + List serise = SGuildRedPackConfig.welfareRedPackBySerise.get(config.getRuleId()[0]); serise.stream().sorted((v1,v2)->{ if(v1.getId()>v2.getId()){ return -1; @@ -1315,7 +1315,7 @@ public class GuildLogic { if(config.getRuleType() == 3){ if(config.getGroupId() == 2){ int num = user.getMapManager().getLastMonsterAttack(); - for(SGuildRedPackConfig config1 : SGuildRedPackConfig.welfareRedPackBySerise.get(config.getGroupId())){ + for(SGuildRedPackConfig config1 : SGuildRedPackConfig.welfareRedPackBySerise.get(config.getRuleId()[0])){ if(num >= config1.getRuleId()[1]){ redPacketsMap.put(config.getId(),1); }else{ @@ -1324,7 +1324,7 @@ public class GuildLogic { } } }else{ - if(config.getId()==SGuildRedPackConfig.welfareRedPackBySerise.get(config.getGroupId()).get(0).getId()) + if(config.getId()==SGuildRedPackConfig.welfareRedPackBySerise.get(config.getRuleId()[0]).get(0).getId()) redPacketsMap.put(config.getId(),0); } }else{ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/redpacket/WelfareRedPackSendHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/redpacket/WelfareRedPackSendHandler.java index 1c5bb533d..d8c013c0a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/redpacket/WelfareRedPackSendHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/redpacket/WelfareRedPackSendHandler.java @@ -23,7 +23,7 @@ public class WelfareRedPackSendHandler implements IEventHandler { SGuildRedPackConfig sGuildRedPackConfig = SGuildRedPackConfig.sWelfareRedPackByRule.get(directEvent.getType()); if(sGuildRedPackConfig.getRuleType() == 3){ boolean f = false; - for(SGuildRedPackConfig config : SGuildRedPackConfig.welfareRedPackBySerise.get(sGuildRedPackConfig.getGroupId())){ + for(SGuildRedPackConfig config : SGuildRedPackConfig.welfareRedPackBySerise.get(sGuildRedPackConfig.getRuleId()[0])){ if(config.getRuleId()[1] == directEvent.getNum()){ sGuildRedPackConfig = config; f=true; diff --git a/tablemanager/src/main/java/config/SGuildRedPackConfig.java b/tablemanager/src/main/java/config/SGuildRedPackConfig.java index 1dbde0186..5e020d193 100644 --- a/tablemanager/src/main/java/config/SGuildRedPackConfig.java +++ b/tablemanager/src/main/java/config/SGuildRedPackConfig.java @@ -70,12 +70,12 @@ public class SGuildRedPackConfig implements BaseConfig { sWelfareRedPackByRule.put(entry.getValue().getRuleId()[0],entry.getValue()); } if(entry.getValue().getRuleType() == 3){ - if(welfareRedPackBySerise.containsKey(entry.getValue().getGroupId())){ - welfareRedPackBySerise.get(entry.getValue().getGroupId()).add(entry.getValue()); + if(welfareRedPackBySerise.containsKey(entry.getValue().getRuleId()[0])){ + welfareRedPackBySerise.get(entry.getValue().getRuleId()[0]).add(entry.getValue()); }else{ List list = new ArrayList<>(); list.add(entry.getValue()); - welfareRedPackBySerise.put(entry.getValue().getGroupId(),list); + welfareRedPackBySerise.put(entry.getValue().getRuleId()[0],list); } } } From e150375e8c699c90cb2a80b5e8e070a377a92a10 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Thu, 10 Jun 2021 18:18:35 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E7=A4=BC=E5=8C=85?= =?UTF-8?q?=E8=B4=AD=E4=B9=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java index 6fd4067c9..464035c5d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java @@ -138,6 +138,8 @@ public class BuyGoodsNewLogic { price = 0; orderId = "free-order"; openId = "free-openId"; + }else{ + price= (int)sRechargeCommodityConfig.getPrice() *100; } MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.TEST_BUY_GIGT_GOODS_RESPONSE_VALUE,null,true); sendGoods(uid, goodsId, openId, orderId,System.currentTimeMillis(), price);