diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/NewRechargeSumDayActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/NewRechargeSumDayActivity.java index 30c1342c4..fed77b39e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/NewRechargeSumDayActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/NewRechargeSumDayActivity.java @@ -129,7 +129,7 @@ class NewRechargeSumDayActivity extends AbstractActivity { } if (mark.size() == 0){ mark.add(1); - return 1; + return 1; } return 0; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/home/HomeLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/home/HomeLogic.java index 7659a8b34..5088cd77a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/home/HomeLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/home/HomeLogic.java @@ -235,8 +235,8 @@ public class HomeLogic { // 特权 boolean allowed = user.getPlayerInfoManager().checkFunctionIsAllowed(VipPrivilegeType.HOME_ADD_EARNINGS); if (allowed){ - int[][]condition= SPrivilegeTypeConfig.getsPrivilegeTypeConfigMap().get(VipPrivilegeType.HOME_ADD_EARNINGS).getCondition(); - minutesNum = minutesNum * condition[0][1] / 10000; + int count = PlayerLogic.getInstance().getMaxCountByPrivilege(user, VipPrivilegeType.HOME_ADD_EARNINGS); + minutesNum = minutesNum * count / 10000; } // 可领取上限 int getNumMax = homeLandLevel.getStorage()[0][1]; 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 5d1976278..0afe24c1a 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 @@ -1578,7 +1578,7 @@ public class PlayerLogic { * @param privilegeId * @return */ - private int getMaxCountByPrivilege(User user,int privilegeId){ + public int getMaxCountByPrivilege(User user,int privilegeId){ SPrivilegeTypeConfig sPrivilegeTypeConfig = SPrivilegeTypeConfig.getsPrivilegeTypeConfigMap().get(privilegeId); int cond = 0; switch (sPrivilegeTypeConfig.getUnlockType()){