From 5778fe091cbcd57fe51d4d1fc29e487abdb0dea3 Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 9 Sep 2022 18:18:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E6=9D=83=E7=BB=8F=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/player/PlayerLogic.java | 38 ++++++++++++------- 1 file changed, 25 insertions(+), 13 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 5444a6bfb..394862605 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 @@ -1439,13 +1439,12 @@ public class PlayerLogic { user.getPlayerInfoManager().setRideLevel(rideLevel+1); MessageUtil.sendMessage(session,1,messageType.getNumber(),null,true); } - public boolean check(User user, int privilageTypeId, int checkNum){ -// return priviliageCheck(user,privilageTypeId,checkNum,false); + public boolean check(User user, int privilegeTypeId, int checkNum){ Map vipInfo = user.getPlayerInfoManager().getVipInfo(); - if(privilageTypeId == 0){ + if(privilegeTypeId == 0){ return true; } - List sPrivilegeTypeConfigs = SPrivilegeTypeConfig.privilegeByType.get(privilageTypeId); + List sPrivilegeTypeConfigs = SPrivilegeTypeConfig.privilegeByType.get(privilegeTypeId); List typePrivileges = new ArrayList<>(); for(SPrivilegeTypeConfig config:sPrivilegeTypeConfigs){ if(!vipInfo.containsKey(config.getId())){ @@ -1456,12 +1455,12 @@ public class PlayerLogic { if(typePrivileges.isEmpty()){ return false; } - for(Integer privilageId:typePrivileges){ - VipInfo info = vipInfo.get(privilageId); + for(Integer privilegeId:typePrivileges){ + VipInfo info = vipInfo.get(privilegeId); if(info.getEffectTime()!=0&&TimeUtils.now()/1000>info.getEffectTime()){ continue; } - int mCount = getMaxCountByPrivilege(user,privilageId); + int mCount = getMaxCountByPrivilege(user,privilegeId); if(mCount==-1){ return true; } @@ -1472,13 +1471,15 @@ public class PlayerLogic { } return false; } - public boolean checkAndUpdate(User user, int privilageTypeId, int updateNum){ -// return priviliageCheck(user,privilageTypeId,updateNum,true); + + public boolean checkAndUpdate(User user, int privilegeTypeId, int updateNum){ + boolean check = check(user, privilegeTypeId, updateNum); + Map vipInfo = user.getPlayerInfoManager().getVipInfo(); - if(privilageTypeId == 0){ + if(privilegeTypeId == 0){ return true; } - List sPrivilegeTypeConfigs = SPrivilegeTypeConfig.privilegeByType.get(privilageTypeId); + List sPrivilegeTypeConfigs = SPrivilegeTypeConfig.privilegeByType.get(privilegeTypeId); List typePrivileges = new ArrayList<>(); for(SPrivilegeTypeConfig config:sPrivilegeTypeConfigs){ if(!vipInfo.containsKey(config.getId())){ @@ -1571,6 +1572,9 @@ public class PlayerLogic { case GlobalsDef.RENOWN_LV_UNLOCK: cond = getRenownPrivilegeLv(user); break; + case VipPrivilegeType.DAY_OF_ONE_GM_RECHARGE_MAX: + cond = user.getPlayerInfoManager().getGmRechargeMax(); + break; default:{ break; } @@ -1971,8 +1975,12 @@ public class PlayerLogic { Item item = user.getItemManager().getItem(list.get(0).getExperience()[0]); long num = Optional.ofNullable(item).map(Item::getItemNum).orElse(0L); for (SPrestigeConfig value : list) { - if (num >= value.getExperience()[1]){ + if (value.getExperience() == null){ lv = value.getLevel(); + break; + } + if (num >= value.getExperience()[1]){ + lv = value.getLevel()+1; }else { break; } @@ -1995,8 +2003,12 @@ public class PlayerLogic { Item item = user.getItemManager().getItem(list.get(0).getExperience()[0]); long num = Optional.ofNullable(item).map(Item::getItemNum).orElse(0L); for (SPrestigeConfig value : list) { - if (num >= value.getExperience()[1]){ + if (value.getExperience() == null){ lv = value.getLevel(); + break; + } + if (num >= value.getExperience()[1]){ + lv = value.getLevel()+1; }else { break; }