diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/UseAndPriceItemHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/UseAndPriceItemHandler.java index fbccaebba..ea5abffde 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/UseAndPriceItemHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/UseAndPriceItemHandler.java @@ -1,5 +1,7 @@ package com.ljsd.jieling.handler; +import com.ljsd.jieling.exception.ErrorCode; +import com.ljsd.jieling.exception.ErrorCodeException; import com.ljsd.jieling.logic.item.ItemLogic; import com.ljsd.jieling.netty.cocdex.PacketNetData; import com.ljsd.jieling.network.session.ISession; @@ -40,9 +42,10 @@ public class UseAndPriceItemHandler extends BaseHandler(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java index 1c39f1426..1af872d9b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java @@ -764,39 +764,39 @@ public class ExpeditionLogic { if(createTime==0){ return; } - SExpeditionSetting sExpeditionSetting = STableManager.getConfig(SExpeditionSetting.class).get(1); - int[][] treasureTime = sExpeditionSetting.getTreasureTime(); - int differentDays = TimeUtils.differentDays(createTime * 1000, TimeUtils.now()); - int sumPeriod = 0; - int newRound = 0; - int round = worldTreasureReward.getRound(); - boolean needReset = false; - for(int[] item : treasureTime){ - sumPeriod+=item[1]; - if(round>item[0]){ - continue; - } - differentDays-=item[1]; - if(differentDays<0){ - newRound = item[0]; - needReset =true; - break; - } - } - if(!needReset){ - differentDays=differentDays % sumPeriod; - for(int[] item : treasureTime){ - differentDays-=item[1]; - if(differentDays<0){ - newRound = item[0]; - break; - } - } - needReset=true; - } +// SExpeditionSetting sExpeditionSetting = STableManager.getConfig(SExpeditionSetting.class).get(1); +// int[][] treasureTime = sExpeditionSetting.getTreasureTime(); +// int differentDays = TimeUtils.differentDays(createTime * 1000, TimeUtils.now()); +// int sumPeriod = 0; +// int newRound = 0; +// int round = worldTreasureReward.getRound(); +// boolean needReset = false; +// for(int[] item : treasureTime){ +// sumPeriod+=item[1]; +// if(round>item[0]){ +// continue; +// } +// differentDays-=item[1]; +// if(differentDays<0){ +// newRound = item[0]; +// needReset =true; +// break; +// } +// } +// if(!needReset){ +// differentDays=differentDays % sumPeriod; +// for(int[] item : treasureTime){ +// differentDays-=item[1]; +// if(differentDays<0){ +// newRound = item[0]; +// break; +// } +// } +// needReset=true; +// } //重置 - if(needReset){ - user.getExpeditionManager().resetTreasureReward(newRound); + if(TimeUtils.nowInt()>=worldTreasureReward.getCreateTime()){ + user.getExpeditionManager().resetTreasureReward(1); sendAllTreasureInfo(user); } } @@ -1021,6 +1021,7 @@ public class ExpeditionLogic { }); response.addAllTreasureRewardState(states); response.setScore(worldTreasureReward.getScore()); + response.setResetTime(worldTreasureReward.getCreateTime()); MessageUtil.sendMessage(session,1,messageType.getNumber(),response.build(),true); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index 0a1d14867..27d3878b1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -1231,6 +1231,7 @@ public class ItemUtil { int itemType = getItemType(sItem); switch (itemType) { case GlobalItemType.ITEM: + case GlobalItemType.SOUL_MARK: putcountMap(itemId,itemNum,itemMap); break; default: