From a1cea20bdcd016849bb0f048d7ae46c298a894bb Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 25 Dec 2020 10:06:22 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E5=B0=86=E6=9D=A5=E8=A2=AD?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=BB=93=E6=9D=9F=EF=BC=8C=E6=B8=85=E7=A9=BA?= =?UTF-8?q?=E9=81=93=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/activity/DefaultEmptyActivity.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/DefaultEmptyActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/DefaultEmptyActivity.java index 04062dac7..e3fe03f64 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/DefaultEmptyActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/DefaultEmptyActivity.java @@ -55,7 +55,8 @@ public class DefaultEmptyActivity extends AbstractActivity{ MailLogic.getInstance().sendMail(user.getId(),title,content,mailReward,(int)(System.currentTimeMillis()/1000), Global.MAIL_EFFECTIVE_TIME); }*/ } - }else if(sGlobalActivity.getType() == ActivityType.EXCHANGEANDDROP){ + }else if(sGlobalActivity.getType() == ActivityType.EXCHANGEANDDROP || sGlobalActivity.getType() == ActivityType.NEW_GENERAL_ATTACK){ + // 限时兑换和新将来袭活动结束会清空道具 int shopId = sGlobalActivity.getShopId()[0]; SStoreConfig sStoreConfig = SStoreConfig.getSstoreConfigBuyStore().get(shopId).get(0); int removeItemId = sStoreConfig.getCost()[0][0]; From 53b1dc14800cf590d7c1efc614778b0609093e18 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Fri, 1 Jan 2021 19:35:29 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=A3=AE=E7=BD=97=E5=B0=8F=E6=80=AA?= =?UTF-8?q?=E7=BA=A2=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/handler/map/MapLogic.java | 28 ++----------------- 1 file changed, 2 insertions(+), 26 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 0376961e7..0fe28b982 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 @@ -2043,33 +2043,9 @@ public class MapLogic { User user = UserManager.getUser(uid); MapInfoProto.getAllLevelDifficultyInfosResponse.Builder builder = MapInfoProto.getAllLevelDifficultyInfosResponse.newBuilder(); MapManager mapManager = user.getMapManager(); - Map crossInfoMap = mapManager.getCrossInfoMap(); - for (Map.Entry entry : crossInfoMap.entrySet()) { - CommonProto.MapInfo mapInfo = CommonProto.MapInfo - .newBuilder() - .setMapId(entry.getKey()) - .setLeastTime(entry.getValue().getLeastTime()) - .addAllStars(entry.getValue().getStars()) - .build(); - builder.addMapInfos(mapInfo); - } - int starReward = mapManager.getStarReward(); - SChallengeStarBox sChallengeStarBox = STableManager.getConfig(SChallengeStarBox.class).get(starReward); - if(sChallengeStarBox == null ){ - builder.setStarNum(0); - }else{ - builder.setStarNum(sChallengeStarBox.getStarNum()); - } - //登录时检测是否需要重置 - checkTrialReset(user); - builder.addAllPlayedGenMapId(mapManager.getPlayGenMaps()); + builder.setKillCount(mapManager.getTrialInfo().getKillCount()); + builder.addAllTrialRewardInfo(mapManager.getTrialInfo().getTowerReceivedReward()); - for(Map.Entry entry:mapManager.getDifficultyOptions().entrySet()){ - MapInfoProto.DifficultMapOption.Builder difficultMapOption = MapInfoProto.DifficultMapOption.newBuilder(); - difficultMapOption.setId(entry.getKey()); - difficultMapOption.setMapdifficulty(entry.getValue()); - builder.addDifficultMapOptions(difficultMapOption); - } MessageUtil.sendMessage(iSession, 1, msgId, builder.build(), true); } From b603634e6b2666726ddc4edf37ee14eb63f17743 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Fri, 1 Jan 2021 21:37:04 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8D=81=E7=BB=9D=E9=98=B5=E6=9A=82?= =?UTF-8?q?=E6=97=B6=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/rank/RankEnum.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankEnum.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankEnum.java index e1c487428..339d803c3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankEnum.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankEnum.java @@ -25,10 +25,10 @@ public enum RankEnum { GUILD_RED_PACKAGE_RANK(13,RedisKey.GUILD_RED_PACKAGE_RANK,GuildRedPackageRank::new,false),//param1:红包总价格 param2:无 param3:无 CAR_DEALY_RANK(14,RedisKey.CAR_DEALY_RANK,CarDealyRank::new,false),//param1:伤害 param2:无 param3:无 CAR_DEALY_GUILD_RANK(19,RedisKey.CAR_DEALY_GUILD_RANK,CarDealyGuildRank::new,false),//param1:伤害 param2:无 param3:无 - DEATH_PATH_EVERY_PERSON_RANK(15,RedisKey.DEATH_PATH_EVERY_PERSON_RANK,DeathPathEveryPersonRank::new,true),//param1:当前阵玩家伤害 param2:无 param3:无 - DEATH_PATH_EVERY_GUILD_RANK(16,RedisKey.DEATH_PATH_EVERY_GUILD_RANK, DeathPathEveryGuildRank::new,true),//param1:当前阵公会伤害 param2:当前工会挑战人数 param3:无 - DEATH_PATH_TOTAL_PERSON_RANK(17,RedisKey.DEATH_PATH_TOTAL_PERSON_RANK,DeathPathTotalPersonRank::new,true),//param1:玩家总伤害 param2:无 param3:无 - DEATH_PATH_TOTAL_GUILD_RANK(18,RedisKey.DEATH_PATH_TOTAL_GUILD_RANK,DeathPathTotalGuildRank::new,true),//param1:工会总伤害 param2:无 param3:无 + DEATH_PATH_EVERY_PERSON_RANK(15,RedisKey.DEATH_PATH_EVERY_PERSON_RANK,DeathPathEveryPersonRank::new,false),//param1:当前阵玩家伤害 param2:无 param3:无 + DEATH_PATH_EVERY_GUILD_RANK(16,RedisKey.DEATH_PATH_EVERY_GUILD_RANK, DeathPathEveryGuildRank::new,false),//param1:当前阵公会伤害 param2:当前工会挑战人数 param3:无 + DEATH_PATH_TOTAL_PERSON_RANK(17,RedisKey.DEATH_PATH_TOTAL_PERSON_RANK,DeathPathTotalPersonRank::new,false),//param1:玩家总伤害 param2:无 param3:无 + DEATH_PATH_TOTAL_GUILD_RANK(18,RedisKey.DEATH_PATH_TOTAL_GUILD_RANK,DeathPathTotalGuildRank::new,false),//param1:工会总伤害 param2:无 param3:无 GUILD_FORCE_RANK(20,RedisKey.GUILD_FORCE_RANK,GuildForceRank::new,false),//param1:公会总战力 param2:无 param3:无 //达人排行榜 EXPERT_RANK(21,RedisKey.EXPERT_RANK,GoldRank::new,false),//param1:活动进度 param2:无 param3:无 From 09b18714f0b08a41336a0d138a21402ebcf47817 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sat, 9 Jan 2021 00:00:00 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A5=BD=E5=8F=8B=E4=B8=8A=E9=99=90?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/friend/FriendLogic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java index ea99f8c62..78b53e909 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java @@ -259,7 +259,7 @@ public class FriendLogic { continue; } if (friends1.size() >= maxFriends){ - if(inviteUidsList.size()>1){ + if(inviteUidsList.size()==1){ throw new ErrorCodeException(ErrorCode.FRIENDS_SIDE_MAX); }else{ continue;