From 7a0dacf99501b52e2c410c7b6ea725be4dd50fd9 Mon Sep 17 00:00:00 2001 From: "DESKTOP-C3M45P4\\dengdan" Date: Tue, 17 Jun 2025 12:35:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=AF=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E9=A2=86=E5=8F=96=E5=8D=95=E7=AC=94=E5=85=85=E5=80=BC=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/handler/GetPlayerInfoHandler.java | 9 ++++++ .../activityLogic/GmActivityLogic.java | 32 +++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java index 5ea3461bd..f9e266f38 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java @@ -24,9 +24,11 @@ import com.ljsd.jieling.logic.activity.fourChallenge.FourChallengeLogic; import com.ljsd.jieling.logic.arena.LuofuLogic; import com.ljsd.jieling.logic.dao.*; import com.ljsd.jieling.logic.dao.root.GlobalSystemControl; +import com.ljsd.jieling.logic.dao.root.GuildInfo; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.equip.EquipLogic; import com.ljsd.jieling.logic.explorerMap.ExplorerMapLogic; +import com.ljsd.jieling.logic.family.GuildLogic; import com.ljsd.jieling.logic.home.event.HomeEvent; import com.ljsd.jieling.logic.mail.MailLogic; import com.ljsd.jieling.logic.mission.GameEvent; @@ -113,6 +115,13 @@ public class GetPlayerInfoHandler extends BaseHandler{ } } // guildServerCheck(user);// 工会服务器id检查 + int guildId = user.getPlayerInfoManager().getGuildId(); + if(guildId > 0){ + GuildInfo guildInfo = GuilidManager.getGuildInfo(guildId); + if(guildInfo == null){ + user.getPlayerInfoManager().setGuildId(0); + } + } CommonProto.Player player = CBean2Proto.getPlayer(userId, user.getPlayerInfoManager(), mapManager); CommonProto.SuddenlyBossInfo suddenlyBossInfo = CommonProto.SuddenlyBossInfo.newBuilder() .setSuddBossId(mapManager.getSuddenlyBoss()) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/GmActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/GmActivityLogic.java index bf56df863..916bc8ab5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/GmActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/GmActivityLogic.java @@ -107,6 +107,9 @@ public class GmActivityLogic implements IEventHandler { case 4://单笔充值 getRewardToSingleRecharge(user, gmActivity, price); break; + case 7://可重复单笔充值 + getRewardToUnlimitSingleRecharge(user, gmActivity, price); + break; default://3、5、6(多日累充,永久大充,开服首日累充) getDefaultReward(user, gmActivity, price); break; @@ -268,6 +271,35 @@ public class GmActivityLogic implements IEventHandler { } } + /** + * 无限制单笔充值奖励(可重复领取) + */ + private void getRewardToUnlimitSingleRecharge(User user, GmActivity gmActivity, double price) throws Exception { + List gmMissionList = findAllGmMission(gmActivity.getId()); + for (ARBMission arbMission : gmMissionList) { + GmMission gmMission = gmActivity.getMissionMap().getOrDefault(arbMission.getId(), new GmMission()); + // 已领取 +// if (gmMission.getState() == 1){ +// LOGGER.error("单笔充值奖励,档位已领取,userid:{}, 活动id:{}, 档位id:{}", user.getId(),gmActivity.getId(),gmMission.getId()); +// continue; +// } + // 不能领 + if (price != arbMission.getRechargeNum()){ + LOGGER.error("单笔充值奖励,金额对比失败,userid:{}, 活动id:{}, 金额:{}-{}", user.getId(),gmActivity.getId(),price,arbMission.getRechargeNum()); + continue; + } + // 发邮件 + String mailReward = ItemUtil.getMailReward(arbMission.getReward()); + if (!StringUtil.isEmpty(mailReward)){ + MailLogic.getInstance().sendMail(user.getId(),arbMission.getActivity().getName(),arbMission.getTitle(),mailReward,TimeUtils.nowInt(),Global.MAIL_EFFECTIVE_TIME); + } + // 记录到库 + gmMission.setId(arbMission.getId()); + gmMission.setState(1); + gmActivity.putMissionMap(arbMission.getId(), gmMission); + } + } + /** * 妖晶返利奖励 */