From ec3ea76864f848ecee320df23e8c28db85576eef Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Wed, 27 Oct 2021 07:44:08 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=B8=80=E9=94=AE=E9=A2=86=E5=8F=96?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/handler/mission/TakeMissionRewardHandler.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/TakeMissionRewardHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/TakeMissionRewardHandler.java index e053c38b4..c6cdb936f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/TakeMissionRewardHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/mission/TakeMissionRewardHandler.java @@ -24,11 +24,7 @@ public class TakeMissionRewardHandler extends BaseHandler Date: Wed, 27 Oct 2021 13:49:08 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E6=9C=88=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/player/PlayerLogic.java | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index 83730f64e..8e046ab9f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -1800,11 +1800,23 @@ public class PlayerLogic { List cardInfos = new LinkedList<>(); PlayerManager playerInfoManager = user.getPlayerInfoManager(); NewRechargeInfo rechargeInfo = playerInfoManager.getNewRechargeInfo(); - STableManager.getConfig(SMonthcardConfig.class).forEach((integer, sMonthcardConfig) -> { - int time = playerInfoManager.getMonthCard().getOrDefault(integer,0); - int state = playerInfoManager.getMonthCardDailyTake().contains(integer)?1:0; - double saveAmt = integer==1?rechargeInfo.getMonthRr():rechargeInfo.getsMonthRr(); - cardInfos.add(CommonProto.MonthCardInfo.newBuilder().setId(integer).setEndingTime(time).setState(state).setTotleAmt(saveAmt).build()); + STableManager.getConfig(SMonthcardConfig.class).forEach((key, config) -> { + int time = playerInfoManager.getMonthCard().getOrDefault(key,0); + int state = playerInfoManager.getMonthCardDailyTake().contains(key)?1:0; + double saveAmt = 0; + switch (key){ + case 1: + saveAmt = rechargeInfo.getMonthRr(); + break; + case 2: + saveAmt = rechargeInfo.getsMonthRr(); + break; + case 3: + saveAmt = rechargeInfo.getSinceremonth(); + break; + default:break; + } + cardInfos.add(CommonProto.MonthCardInfo.newBuilder().setId(key).setEndingTime(time).setState(state).setTotleAmt(saveAmt).build()); }); return cardInfos; } From 97e23512f27b6cf51735849cf9155a173130fec2 Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Fri, 29 Oct 2021 15:49:40 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E7=83=AD=E6=9B=B4=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/activity/ActivityLogic.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java index 5819c9631..e0df35597 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java @@ -400,6 +400,21 @@ public class ActivityLogic implements IEventHandler{ } } } + // TODO 修复每周任务和万象活动 11月3日删除 + // 1635696000000L = 2021-11-01 00:00:00 + if (now < 1635696000000L) { + if(sGlobalActivity.getId() == 40000 && !TimeUtils.isSameWeek(now, user.getUserMissionManager().getJadeDynastyMissionType().getWeekRefresh())) { + user.getUserMissionManager().onGameEvent(user, GameEvent.JADE_DYNASTY_WEEK_REFRESH, sGlobalActivity.getId()); + } + if (sGlobalActivity.getShopId() != null && sGlobalActivity.getShopId().length > 0) { + for (int shopId : sGlobalActivity.getShopId()) { + if (!user.getStoreManager().getStoreInfoMap().containsKey(shopId)) { + Poster.getPoster().dispatchEvent(new ActivityStateChangeEvent(user.getId(), sGlobalActivity.getId(), 1)); + break; + } + } + } + } continue; } initAllActivityMission(activityManager.getActivityMissionMap(),openActivityId); From 40ae6b6a1b2d54fb066cf1ce2dbec9eb464bf651 Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Fri, 29 Oct 2021 16:02:35 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/activity/ActivityLogic.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java index cfb8fa71e..3fc462015 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java @@ -404,11 +404,13 @@ public class ActivityLogic implements IEventHandler{ // 1635696000000L = 2021-11-01 00:00:00 if (now < 1635696000000L) { if(sGlobalActivity.getId() == 40000 && !TimeUtils.isSameWeek(now, user.getUserMissionManager().getJadeDynastyMissionType().getWeekRefresh())) { + LOGGER.info("checkActivityOfUser uid={} fix JADE_DYNASTY_WEEK_REFRESH", user.getId()); user.getUserMissionManager().onGameEvent(user, GameEvent.JADE_DYNASTY_WEEK_REFRESH, sGlobalActivity.getId()); } if (sGlobalActivity.getShopId() != null && sGlobalActivity.getShopId().length > 0) { for (int shopId : sGlobalActivity.getShopId()) { if (!user.getStoreManager().getStoreInfoMap().containsKey(shopId)) { + LOGGER.info("checkActivityOfUser uid={} fix sGlobalActivity shop", user.getId()); Poster.getPoster().dispatchEvent(new ActivityStateChangeEvent(user.getId(), sGlobalActivity.getId(), 1)); break; } From 59c91e3233d7a3560382c13b05dccbe037a171cd Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Fri, 29 Oct 2021 16:10:22 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/activity/ActivityLogic.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java index 3fc462015..c1f510fd5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java @@ -407,9 +407,9 @@ public class ActivityLogic implements IEventHandler{ LOGGER.info("checkActivityOfUser uid={} fix JADE_DYNASTY_WEEK_REFRESH", user.getId()); user.getUserMissionManager().onGameEvent(user, GameEvent.JADE_DYNASTY_WEEK_REFRESH, sGlobalActivity.getId()); } - if (sGlobalActivity.getShopId() != null && sGlobalActivity.getShopId().length > 0) { + if (sGlobalActivity.getId() == 8301 && sGlobalActivity.getShopId() != null && sGlobalActivity.getShopId().length > 0) { for (int shopId : sGlobalActivity.getShopId()) { - if (!user.getStoreManager().getStoreInfoMap().containsKey(shopId)) { + if (shopId != 0 && !user.getStoreManager().getStoreInfoMap().containsKey(shopId)) { LOGGER.info("checkActivityOfUser uid={} fix sGlobalActivity shop", user.getId()); Poster.getPoster().dispatchEvent(new ActivityStateChangeEvent(user.getId(), sGlobalActivity.getId(), 1)); break; From ff57fe280e4c923bc14ce361f6519116c8f31a7b Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Fri, 29 Oct 2021 16:19:26 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=95=86=E5=BA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/activity/ActivityLogic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java index c1f510fd5..a5dc4a32d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java @@ -407,7 +407,7 @@ public class ActivityLogic implements IEventHandler{ LOGGER.info("checkActivityOfUser uid={} fix JADE_DYNASTY_WEEK_REFRESH", user.getId()); user.getUserMissionManager().onGameEvent(user, GameEvent.JADE_DYNASTY_WEEK_REFRESH, sGlobalActivity.getId()); } - if (sGlobalActivity.getId() == 8301 && sGlobalActivity.getShopId() != null && sGlobalActivity.getShopId().length > 0) { + if (sGlobalActivity.getShopId() != null && sGlobalActivity.getShopId().length > 0) { for (int shopId : sGlobalActivity.getShopId()) { if (shopId != 0 && !user.getStoreManager().getStoreInfoMap().containsKey(shopId)) { LOGGER.info("checkActivityOfUser uid={} fix sGlobalActivity shop", user.getId()); From faa21bb46f71c1586c17f7173a111d24ca1ef02c Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Sat, 30 Oct 2021 01:43:45 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E7=99=BD=E9=87=91=E8=A3=85=E5=A4=87?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=87=E6=BB=A4=E6=8E=89=E8=84=B1=E8=A3=85?= =?UTF-8?q?=E5=A4=87=E8=8E=B7=E5=BE=97?= 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6faaaf74c..8bc92d0c4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -603,7 +603,7 @@ public class ItemUtil { if (sItem.getItemBaseType()==6){ equipManager.addEquipList(entry.getKey()); } - if (sItem.getItemType()==3){ + if (sItem.getItemType()==3 && reason != BIReason.EQUIP_UNLOAD_REWARD){ if (changeEquipList==null) { changeEquipList=new ArrayList<>(); } From 29194289cc2ffa1495bda7c0224c6db5df05c9d5 Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Sat, 30 Oct 2021 02:20:57 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E5=88=86=E8=A7=A3=E8=8B=B1=E9=9B=84?= =?UTF-8?q?=EF=BC=8C=E5=92=8C=E5=8D=87=E6=98=9F=E5=90=9E?= 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, 2 insertions(+), 1 deletion(-) 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 8bc92d0c4..373a9c912 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -603,7 +603,8 @@ public class ItemUtil { if (sItem.getItemBaseType()==6){ equipManager.addEquipList(entry.getKey()); } - if (sItem.getItemType()==3 && reason != BIReason.EQUIP_UNLOAD_REWARD){ + if (sItem.getItemType()==3 && reason != BIReason.EQUIP_UNLOAD_REWARD + && reason != BIReason.UPHERO_DECOMPOS_HERO_REWARD && reason != BIReason.DECOMPOS_HERO_REWARD){ if (changeEquipList==null) { changeEquipList=new ArrayList<>(); } From 452462606d872774a50e35741fd4fd7521d392e3 Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Sat, 30 Oct 2021 15:01:52 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E8=AE=A1=E7=AE=97=E4=B8=96=E7=95=8C?= =?UTF-8?q?=E7=AD=89=E7=BA=A7bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/db/mongo/LjsdMongoTemplate.java | 20 +++++++++++++++++-- .../ljsd/jieling/logic/GlobleSystemLogic.java | 5 +++-- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/LjsdMongoTemplate.java b/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/LjsdMongoTemplate.java index 25cc6a0de..974b9102a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/LjsdMongoTemplate.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/LjsdMongoTemplate.java @@ -9,6 +9,8 @@ import com.ljsd.jieling.logic.dao.ServerConfig; import com.ljsd.jieling.logic.dao.root.GlobalSystemControl; import com.ljsd.jieling.logic.dao.root.GuildInfo; import com.mongodb.*; +import config.SMServerArenaSetting; +import manager.STableManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.data.mongodb.core.MongoTemplate; @@ -66,10 +68,16 @@ public class LjsdMongoTemplate implements MongoUpdateImp { } } } else { - for (MongoTemplate mongoTemplate : MongoUtil.mongoTemplateMap.values()) { + MongoTemplate mongoTemplate = MongoUtil.mongoTemplateMap.get(GameApplication.serverId); + if (mongoTemplate != null) { List all = mongoTemplate.findAll(clazz); - list.addAll(all); + return all; } + +// for (MongoTemplate mongoTemplate : MongoUtil.mongoTemplateMap.values()) { +// List all = mongoTemplate.findAll(clazz); +// list.addAll(all); +// } } return list; //return mongoTemplate.findAll(clazz,collectionName); @@ -93,6 +101,14 @@ public class LjsdMongoTemplate implements MongoUpdateImp { } } } else { + SMServerArenaSetting setting = STableManager.getConfig(SMServerArenaSetting.class).get(1); + int rankEndLine = setting.getWorldLevLimit(); + if (query.getLimit() == rankEndLine) { + MongoTemplate mongoTemplate = MongoUtil.mongoTemplateMap.get(GameApplication.serverId); + List all = mongoTemplate.find(query, entityClass); + list.addAll(all); + return list; + } for (MongoTemplate mongoTemplate : MongoUtil.mongoTemplateMap.values()) { List all = mongoTemplate.find(query, entityClass); list.addAll(all); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobleSystemLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobleSystemLogic.java index 6d2a6a400..ad024771d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobleSystemLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobleSystemLogic.java @@ -205,13 +205,14 @@ public class GlobleSystemLogic implements IEventHandler { } private static void setGlobalWorldLevelCache(int globalWorldLevelCache) { - if(globalWorldLevelCache>getGlobalWorldLevelCache()){ + // TODO 下次更新前删除 强制设置一次世界等级 +// if(globalWorldLevelCache>getGlobalWorldLevelCache()){ GLOABLE_WORLD_LEVE_CACHE = globalWorldLevelCache; RedisUtil.getInstence().putMapEntry(RedisKey.SERVER_WORLDLEVE_INFO,"",String.valueOf(GameApplication.serverId),globalWorldLevelCache); InnerMessageUtil.broadcastWithRandom(user->{ MessageUtil.sendIndicationMessage(OnlineUserManager.getSessionByUid(user.getId()), 1, MessageTypeProto.MessageType.WorldLevelIndication_VALUE, PlayerInfoProto.WorldLevelIndication.newBuilder().setWorldLeve(GlobleSystemLogic.getGlobalWorldLevelCache()).build(), true); }, new LinkedList<>(OnlineUserManager.sessionMap.keySet()),10); - } +// } }