diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/fourChallenge/FourChallengeLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/fourChallenge/FourChallengeLogic.java index 2db5e4213..e9ee85ccd 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/fourChallenge/FourChallengeLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/fourChallenge/FourChallengeLogic.java @@ -116,7 +116,6 @@ public class FourChallengeLogic { status = state; } - /** * 获取四灵活动信息 */ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java index 7895eed24..29222ce63 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java @@ -1262,7 +1262,6 @@ public class PlayerManager extends MongoBase { } /** * 获取四灵试炼总层数 - * @return */ public int getFourChallengeTotal(){ int result = 0; @@ -1295,7 +1294,7 @@ public class PlayerManager extends MongoBase { int storeMax = STableManager.getConfig(SCampTowerSetting.class).get(1).getTimesStoreMax(); int num = fourChallengeRemainTimes[index] + value; // 比较,大于上限取上限 - fourChallengeRemainTimes[index] = num > storeMax?storeMax:num; + fourChallengeRemainTimes[index] = Math.min(num, storeMax); updateString("fourChallengeRemainTimes", fourChallengeRemainTimes); }