diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossLingmaiSecretAreaBattleHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossLingmaiSecretAreaBattleHandler.java index 1bff57397..4fcc02ffc 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossLingmaiSecretAreaBattleHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossLingmaiSecretAreaBattleHandler.java @@ -120,8 +120,11 @@ public class CrossLingmaiSecretAreaBattleHandler extends BaseHandler 10 ? 10 : ((TimeUtils.nowInt() - myLingmai.getOccupyTime()) / 60); - myLingmai.setScore1(myLingmai.getScore1()+second*config.getRewardList()[0][1]); + int minute = ((TimeUtils.nowInt() - (int)myLingmai.getGetAwardTimeOrOccupyTime()) / 60) > 10 ? 10 : ((TimeUtils.nowInt() - (int)myLingmai.getGetAwardTimeOrOccupyTime()) / 60); + int second =((TimeUtils.nowInt() - (int)myLingmai.getGetAwardTimeOrOccupyTime()) % 60) >60 ? + 60 : ((TimeUtils.nowInt() - (int)myLingmai.getGetAwardTimeOrOccupyTime()) % 60); + myLingmai.setScore1(myLingmai.getScore1() + minute*config.getRewardList()[0][1]+(second*(config.getRewardList()[0][1]/60))); + //myLingmai.setGetAwardTimeOrOccupyTime(TimeUtils.nowInt()); int score = myLingmai.getScore1() + config.getRewardList()[0][1] * myLingmai.getOccupyTime(); rank = RankContext.getRankEnum(RankEnum.CROSS_LINGMAI_RANK_PERSON.getType()); rank.addRank(user.getId(), String.valueOf(crossGroup) + RedisKey.Delimiter_colon + group, score); @@ -173,16 +176,20 @@ public class CrossLingmaiSecretAreaBattleHandler extends BaseHandler 10 ? 10 : ((TimeUtils.nowInt() - (int)oldOwner.getGetAwardTimeOrOccupyTime()) / 60); - oldOwner.setScore1(oldOwner.getScore1()+second*config.getRewardList()[0][1]); + int minute = ((TimeUtils.nowInt() - (int)oldOwner.getGetAwardTimeOrOccupyTime()) / 60) > 10 ? 10 : ((TimeUtils.nowInt() - (int)oldOwner.getGetAwardTimeOrOccupyTime()) / 60); + int second =((TimeUtils.nowInt() - (int)oldOwner.getGetAwardTimeOrOccupyTime()) % 60) >60 ? + 60 : ((TimeUtils.nowInt() - (int)oldOwner.getGetAwardTimeOrOccupyTime()) % 60); + oldOwner.setScore1(oldOwner.getScore1()+minute*config.getRewardList()[0][1]+(second*(config.getRewardList()[0][1]/60))); int score = oldOwner.getScore1() + config.getRewardList()[0][1]*oldOwner.getOccupyTime(); rank.addRank(defUid, String.valueOf(crossGroup) + RedisKey.Delimiter_colon + group, score); if (myLingmaiId != 0) { //本人已有灵脉结算 LingMaiSecretArea myLingmai = lingMaiMap.get(String.valueOf(myLingmaiId));//上一个占领者 config = SLodeConfig.lodeConfig.get(myLingmaiId); - second = ((TimeUtils.nowInt() - (int)myLingmai.getGetAwardTimeOrOccupyTime()) / 60) > 10 ? 10 : ((TimeUtils.nowInt() - (int)myLingmai.getGetAwardTimeOrOccupyTime()) / 60); - myLingmai.setScore1(myLingmai.getScore1()+second*config.getRewardList()[0][1]); + minute = ((TimeUtils.nowInt() - (int)myLingmai.getGetAwardTimeOrOccupyTime()) / 60) > 10 ? 10 : ((TimeUtils.nowInt() - (int)myLingmai.getGetAwardTimeOrOccupyTime()) / 60); + second =((TimeUtils.nowInt() - (int)oldOwner.getGetAwardTimeOrOccupyTime()) % 60) >60 ? + 60 : ((TimeUtils.nowInt() - (int)oldOwner.getGetAwardTimeOrOccupyTime()) % 60); + myLingmai.setScore1(myLingmai.getScore1()+minute*config.getRewardList()[0][1]+(second*(config.getRewardList()[0][1]/60))); myLingmai.setGetAwardTimeOrOccupyTime(TimeUtils.nowInt()); score = myLingmai.getScore1() + config.getRewardList()[0][1] * myLingmai.getOccupyTime(); rank = RankContext.getRankEnum(RankEnum.CROSS_LINGMAI_RANK_PERSON.getType()); @@ -232,9 +239,9 @@ public class CrossLingmaiSecretAreaBattleHandler extends BaseHandler