From 8788dba24eb98631a69450749e0ddffe318b7efa Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Tue, 22 Sep 2020 18:16:40 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=85=AC=E4=BC=9Abug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/family/GuildLogic.java | 4 ++-- .../com/ljsd/jieling/logic/rank/rankImpl/ForceCurrRank.java | 2 +- 2 files 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 4ba0f1fa7..4734ed855 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 @@ -650,8 +650,9 @@ public class GuildLogic { throw new ErrorCodeException(ErrorCode.FAMILY_NOT_KICK_IN_WAR); } + User targetUser = UserManager.getUser(targetUid); //TODO lock check - OnUserLeveFamily(user); + OnUserLeveFamily(targetUser); Family.KickOutIndication kickIndication = Family.KickOutIndication.newBuilder().setUid(targetUid).build(); sendIndicationToMember(guildInfo,MessageTypeProto.MessageType.FAMILY_KICK_INDICATION,kickIndication); @@ -663,7 +664,6 @@ public class GuildLogic { if(guildInfo.getDefendInfo().containsKey((targetUid))){ guildInfo.removeDefendInfo(targetUid); } - User targetUser = UserManager.getUser(targetUid); targetUser.getPlayerInfoManager().setGuildId(0); targetUser.getGuildMyInfo().clearOfLevelGuild(); addGuildLog(guildInfo.getId(),GuildDef.Log.KICK,targetUser.getPlayerInfoManager().getNickName()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/ForceCurrRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/ForceCurrRank.java index abae4c757..2a0ac3718 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/ForceCurrRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/ForceCurrRank.java @@ -57,7 +57,7 @@ public class ForceCurrRank extends AbstractRank implements IEventHandler{ private void run(){ Queue infoQueue = ForceCurrRank.infoQueue; - LOGGER.info("实时战力排行,队列长度{}",infoQueue.size()); + // LOGGER.info("实时战力排行,队列长度{}",infoQueue.size()); if(infoQueue.isEmpty()){ return; } From fe44a27b410a13bbc3ef90cdcedebcb13a6e4c88 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Wed, 23 Sep 2020 16:58:00 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=A4=A7=E9=97=B9=E5=A4=A9=E5=AE=AB?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E5=88=B7=E6=96=B0bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java index 2b62152ad..6b1ed8a24 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java @@ -415,7 +415,7 @@ public class ExpeditionLogic { if (typeArr.length != 2) { continue; } - Set tempnode = getNode(sExpeditionFloorConfig, typeArr[0], typeArr[1]); + Set tempnode = getNode(sExpeditionFloorConfig, typeArr[0], Math.min(typeArr[1],indexList.size())); tempnode.forEach(nodeInfo -> { if(indexList.size()==0){ From e73992d1d3ca25eb93f5fc92e77a8e343577cd18 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sat, 10 Oct 2020 13:30:27 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=BB=A1=E7=BA=A7=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index e4b7cf1b3..88b6545a0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -712,6 +712,9 @@ public class ItemUtil { if (levelConfig != null) { //需要先确定下每级真实需要的经验,与客户端实现方式同步,认为表里填的升到下一级所需经验是前边各级经验总和 int[][] integral = levelConfig.getIntegral(); + if(integral==null||integral.length<=0||integral[0].length<=0){ + return; + } STreasureSunlongConfig lastLevelConfig = STreasureSunlongConfig.levelTreasureConfigMap.get(activity.getId()).get(levelConfig.getLevel() - 1); int[][] costItems = integral; if (lastLevelConfig != null) { From f24b25419a342e6af038a99de7ee1d28900db28b Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Wed, 23 Sep 2020 19:20:27 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E7=83=AD=E6=9B=B4=E8=A1=A8=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tablemanager/src/main/java/manager/STableManager.java | 1 + 1 file changed, 1 insertion(+) diff --git a/tablemanager/src/main/java/manager/STableManager.java b/tablemanager/src/main/java/manager/STableManager.java index 99b29d6d3..86ddfdf09 100644 --- a/tablemanager/src/main/java/manager/STableManager.java +++ b/tablemanager/src/main/java/manager/STableManager.java @@ -78,6 +78,7 @@ public class STableManager { //TODO 应该说有数据都加载后统一替换 但是现在部分静态数据遗留在cfg类中 只能一个一个加载 if(!tableName.equals("Map")) loadInCache(cls); + LOGGER.info("hotfix table"+tableName); } Object stable = cls.newInstance(); From 02f957f54eeafae9d8653243901d40c4e1def6c2 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Fri, 25 Sep 2020 11:37:04 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E7=BD=91=E9=A1=B5=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E7=A4=BC=E5=8C=85=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/logic/store/BuyGoodsLogic.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) 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 2593524a2..7c3e8f01e 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 @@ -26,6 +26,7 @@ import com.ljsd.jieling.logic.activity.event.*; import com.ljsd.jieling.logic.dao.RechargeInfo; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.VipInfo; +import com.ljsd.jieling.logic.dao.WorldTreasureReward; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.expedition.ExpeditionLogic; import com.ljsd.jieling.logic.fight.CombatLogic; @@ -844,6 +845,13 @@ public class BuyGoodsLogic { } + if(sRechargeCommodityConfig.getType()==GiftGoodsType.SKY_TREASURE){ + WorldTreasureReward worldTreasureReward = user.getExpeditionManager().getWorldTreasureReward(); + if(worldTreasureReward==null||worldTreasureReward.getIsBuy()==1||worldTreasureReward.getFirstStartTime()>(int)(TimeUtils.now()/1000)){ + continue; + } + } + if(SGlobalActivity.sRechargeId2ActivityId.containsKey(goodsId)){ Integer integer = SGlobalActivity.sRechargeId2ActivityId.get(goodsId); Set ids =getOpenActivity(user,6); @@ -897,12 +905,16 @@ public class BuyGoodsLogic { } - long startTime=0; long endTime=0; int dybuytime = 0; RechargeResult rechargeResult = getStartTime( user ,rechargeInfo, sRechargeCommodityConfig); - if(!rechargeResult.isTag()){ + if(sRechargeCommodityConfig.getType() == 4){ + dybuytime = rechargeInfo.getDyGoodsCanBuyTimes().getOrDefault(goodsId,-1); + if(0==dybuytime||-1==dybuytime){ + continue; + } + } else if(!rechargeResult.isTag()){ continue; } startTime = rechargeResult.getStartTime(); From 716d2160debd881d509c5125aea9b8ec9aa198e0 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Fri, 2 Oct 2020 05:01:11 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=A4=A9=E5=AE=AB=E7=A7=98=E5=AE=9Dbug?= =?UTF-8?q?=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/expedition/ExpeditionLogic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java index 6b1ed8a24..03a13363b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java @@ -1022,7 +1022,7 @@ public class ExpeditionLogic { WorldTreasureReward worldTreasureReward = user.getExpeditionManager().getWorldTreasureReward(); Expedition.ExpeditionTreasureInfoResponse.Builder response = Expedition.ExpeditionTreasureInfoResponse.newBuilder(); - if(worldTreasureReward.getFirstStartTime()!=0&&worldTreasureReward.getFirstStartTime()<=TimeUtils.nowInt()){ + if(worldTreasureReward.getFirstStartTime()!=0&&worldTreasureReward.getFirstStartTime()<=TimeUtils.nowInt()&&worldTreasureReward.getCreateTime()>TimeUtils.now()/1000){ Map rewardStatusMap = worldTreasureReward.getRewardStatusMap(); WorldBossTreasureStaticConfig worldBossTreasureStaticConfig = STableManager.getFigureConfig(WorldBossTreasureStaticConfig.class); Set sWorldBossTreasureConfigs = worldBossTreasureStaticConfig.getIdsByPeriods().get(worldTreasureReward.getRound()); From 5ec7abded10ba1be2931dbf1c8948ff227dedc55 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Fri, 25 Sep 2020 14:02:20 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=A3=AE=E7=BD=97=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=B0=8F=E6=80=AA=E9=87=8D=E7=BD=AE=E5=88=B7=E6=96=B0?= 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 | 1 + 1 file changed, 1 insertion(+) 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 1af83261e..3b2611f00 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 @@ -2857,6 +2857,7 @@ public class MapLogic { trialInfo.setKillCount(0); trialInfo.setBombUseTimes(0); trialInfo.setTowerReceivedReward(new HashSet<>()); + trialInfo.setMonsterHp(new HashMap<>()); if(mapManager.getCurMapId()!=0){ if(MapLogic.getInstance().getMap(user) instanceof TowerMap){ resetMapInfo(user,false);