From 262fd27218fbc6fc86df400e86c8035818d2b859 Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 12 Mar 2021 16:40:19 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=B8=BF=E8=92=99=E9=98=B5,=E7=AD=89?= =?UTF-8?q?=E7=BA=A7=E7=AA=81=E7=A0=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/logic/dao/Hero.java | 10 ++++++++-- .../java/com/ljsd/jieling/logic/hero/HeroLogic.java | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java index 868d32929..2be789997 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java @@ -274,8 +274,14 @@ public class Hero extends MongoBase { */ public int getBreakIdByHongMeng(HeroManager heroManager){ // 英雄在共鸣池中 - if (heroManager.getResonances().values().contains(id) || heroManager.getHongmengGuards().values().contains(id)) { - return HeroLogic.getInstance().calRobotBreaByLevel(templateId, getLevel(heroManager)); + if (heroManager.getHongmengTablet() > 0){ + if (heroManager.getResonances().values().contains(id) || heroManager.getHongmengGuards().values().contains(id)) { + return HeroLogic.getInstance().calRobotBreaByLevel(templateId, getLevel(heroManager)); + } + }else{ + if (heroManager.getResonances().values().contains(id)) { + return HeroLogic.getInstance().calRobotBreaByLevel(templateId, getLevel(heroManager)); + } } return breakId; } 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 f351aa523..9a6cb42b2 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 @@ -1295,7 +1295,7 @@ public class HeroLogic{ for (int i = 0; i < list.size(); i++) { Map.Entry entry = list.get(i); SCHeroRankUpConfig value = entry.getValue(); - if (heroLevel >= value.getOpenLevel()){ + if (heroLevel >= value.getLimitLevel()){ return value.getId(); } From 9fbb26d8551db8d44f85881d110033de78cb34ba Mon Sep 17 00:00:00 2001 From: lvxinran Date: Mon, 15 Mar 2021 09:52:01 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/network/server/SessionManager.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/network/server/SessionManager.java b/serverlogic/src/main/java/com/ljsd/jieling/network/server/SessionManager.java index 93688f7fc..3bedbb1d6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/network/server/SessionManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/network/server/SessionManager.java @@ -186,6 +186,15 @@ public class SessionManager implements INetSession, INetReceived Date: Mon, 15 Mar 2021 11:09:03 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=99=90=E6=97=B6=E7=A5=9E=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/activity/RechargeTotalActivity.java | 2 +- .../eventhandler/LeveGiftEventHander.java | 35 ++++++++++++------- .../src/main/java/config/SSpecialConfig.java | 1 + 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeTotalActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeTotalActivity.java index 416b60903..4bd71de8a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeTotalActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeTotalActivity.java @@ -22,7 +22,7 @@ class RechargeTotalActivity extends AbstractActivity { User user = UserManager.getUser(session.getUid()); RechargeInfo rechargeInfo = user.getPlayerInfoManager().getRechargeInfo(); int days = TimeUtils.differentDaysByHour(rechargeInfo.getCreateTime(), now,0) + 1; - if (missionProgress/1000 < values[0][0] || days < values[0][1]) { + if (missionProgress <= 0 || days < values[0][1]) { return false; } return true; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/eventhandler/LeveGiftEventHander.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/eventhandler/LeveGiftEventHander.java index 082fbb4b7..2322b0e1d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/eventhandler/LeveGiftEventHander.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/eventhandler/LeveGiftEventHander.java @@ -32,18 +32,26 @@ public class LeveGiftEventHander implements IEventHandler { public void onEvent(IEvent event) throws Exception { if(event instanceof UserLevelEvent){ + User user = UserManager.getUser(((UserLevelEvent) event).getUid()); + RechargeInfo rechargeInfo = user.getPlayerInfoManager().getRechargeInfo(); + int[] shenZhuangRule = SSpecialConfig.getOnceArrayValue(SSpecialConfig.SHEN_ZHUANG); + if(((UserLevelEvent) event).getLevel()==shenZhuangRule[0]){ + rechargeInfo.addDyGoodsCanBuyTimes(10001); + rechargeInfo.putLevelAndMoneyBagMap(-1,System.currentTimeMillis()); + +// rechargeInfo.putLevelAndMoneyBagMap(shenZhuangRule[1],System.currentTimeMillis()); + giftIndication(user,new ArrayList<>(1)); + } int[] onceArrayValue = SSpecialConfig.getOnceArrayValue(SSpecialConfig.DISCOUNT_LEVEL); int start = onceArrayValue[0]; int inter = onceArrayValue[1]; if(((UserLevelEvent) event).getLevel() entry = SRechargeCommodityConfig.rechargePlayerLevelMap.floorEntry((int)saveAmt); SRechargeCommodityConfig orDefault = STableManager.getConfig(SRechargeCommodityConfig.class).getOrDefault(entry.getValue(), null); @@ -67,18 +75,19 @@ public class LeveGiftEventHander implements IEventHandler { // BuyGoodsLogic.sendGiftGooodsIndication(user.getId()); List goodsBagInfo = new ArrayList<>(SRechargeCommodityConfig.rechargeCommodityConfigMap.size()); - BuyGoodsLogic.getGoodsBagInfo(user.getId(), goodsBagInfo,false); - ISession session = OnlineUserManager.getSessionByUid(user.getId()); - if(session!=null){ - if(null!= SimpleTransaction.current()){ - //获得多个英雄进行协议合并 - PlayerInfoProto.AllGiftGoodsIndication.Builder build = PlayerInfoProto.AllGiftGoodsIndication.newBuilder().addAllGiftGoodsInfo(goodsBagInfo); - SimpleTransaction.current().dealWhileCommit(new SimpleTransaction.SendTask(build.build(), MessageTypeProto.MessageType.ALL_GIFTGOODS_INDICATION_VALUE)); - } + giftIndication(user,goodsBagInfo); + } + } + + private void giftIndication(User user,List goodsBagInfo) throws Exception { + BuyGoodsLogic.getGoodsBagInfo(user.getId(), goodsBagInfo,false); + ISession session = OnlineUserManager.getSessionByUid(user.getId()); + if(session!=null){ + if(null!= SimpleTransaction.current()){ + //获得多个英雄进行协议合并 + PlayerInfoProto.AllGiftGoodsIndication.Builder build = PlayerInfoProto.AllGiftGoodsIndication.newBuilder().addAllGiftGoodsInfo(goodsBagInfo); + SimpleTransaction.current().dealWhileCommit(new SimpleTransaction.SendTask(build.build(), MessageTypeProto.MessageType.ALL_GIFTGOODS_INDICATION_VALUE)); } } - - - } } diff --git a/tablemanager/src/main/java/config/SSpecialConfig.java b/tablemanager/src/main/java/config/SSpecialConfig.java index 99820abf0..360b5a9d5 100644 --- a/tablemanager/src/main/java/config/SSpecialConfig.java +++ b/tablemanager/src/main/java/config/SSpecialConfig.java @@ -96,6 +96,7 @@ public class SSpecialConfig implements BaseConfig { public static final String SKILL_EFFECT_TGMB = "skill_effect_tgmb";//天宫秘宝购买特权带来的攻击提升万分比(只在天宫生效) public static final String GUILD_LEADER_PASS_TIME = "GuildLeaderPassTime";//会长不上线移交时长 public static final String GUILD_DISMISS_TIME ="GuildDismissTime";//公会全员不上线解散时长 + public static final String SHEN_ZHUANG = "ShenZhuang";//神装礼包推送等级 @Override public void init() throws Exception { From 6804684744463a496e5ce18d41761cbeff8f618c Mon Sep 17 00:00:00 2001 From: lvxinran Date: Mon, 15 Mar 2021 11:11:21 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=9D=9E=E7=A9=BA=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/activity/eventhandler/LeveGiftEventHander.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/eventhandler/LeveGiftEventHander.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/eventhandler/LeveGiftEventHander.java index 2322b0e1d..a1ccc0803 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/eventhandler/LeveGiftEventHander.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/eventhandler/LeveGiftEventHander.java @@ -35,7 +35,7 @@ public class LeveGiftEventHander implements IEventHandler { User user = UserManager.getUser(((UserLevelEvent) event).getUid()); RechargeInfo rechargeInfo = user.getPlayerInfoManager().getRechargeInfo(); int[] shenZhuangRule = SSpecialConfig.getOnceArrayValue(SSpecialConfig.SHEN_ZHUANG); - if(((UserLevelEvent) event).getLevel()==shenZhuangRule[0]){ + if(shenZhuangRule!=null&&shenZhuangRule.length>0&&((UserLevelEvent) event).getLevel()==shenZhuangRule[0]){ rechargeInfo.addDyGoodsCanBuyTimes(10001); rechargeInfo.putLevelAndMoneyBagMap(-1,System.currentTimeMillis()); From 870c524ca499bc6d6f2013e9f49700674fd8f271 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Mon, 15 Mar 2021 11:27:05 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=85=85=E5=80=BC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/activity/RechargeTotalActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeTotalActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeTotalActivity.java index 416b60903..4bd71de8a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeTotalActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeTotalActivity.java @@ -22,7 +22,7 @@ class RechargeTotalActivity extends AbstractActivity { User user = UserManager.getUser(session.getUid()); RechargeInfo rechargeInfo = user.getPlayerInfoManager().getRechargeInfo(); int days = TimeUtils.differentDaysByHour(rechargeInfo.getCreateTime(), now,0) + 1; - if (missionProgress/1000 < values[0][0] || days < values[0][1]) { + if (missionProgress <= 0 || days < values[0][1]) { return false; } return true;