diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/CumulationData.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/CumulationData.java index a65768f16..41c8597d2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/CumulationData.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/CumulationData.java @@ -54,7 +54,7 @@ public class CumulationData { private int arenaScore; - private int consumeGem ; + private long consumeGem ; private Map storyFightInfo =new HashMap<>(3); @@ -325,11 +325,11 @@ public class CumulationData { this.arenaScore = arenaScore; } - public int getConsumeGem() { + public long getConsumeGem() { return consumeGem; } - public void setConsumeGem(int consumeGem) { + public void setConsumeGem(long consumeGem) { this.consumeGem = consumeGem; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java index dc7d33324..eae9c7221 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java @@ -1612,11 +1612,11 @@ public class GuildLogic { reward.put(aDropArray[0], reward.get(aDropArray[0]) + aDropArray[1]); } - int[][] dropArrayReally =new int[reward.size()][]; + long[][] dropArrayReally =new long[reward.size()][]; int index = 0; for(Map.Entry entry:reward.entrySet()){ double doublePercent = (double) percent; - dropArrayReally[index] = new int[]{entry.getKey(),(int)(entry.getValue()*doublePercent/10000)}; + dropArrayReally[index] = new long[]{entry.getKey(),(long)(entry.getValue()*doublePercent/10000)}; index++; } CommonProto.Drop.Builder drop = ItemUtil.drop(user, dropArrayReally, BIReason.RESET_GUILD_SKILL); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java index 0948a7c11..cb6666e21 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java @@ -835,7 +835,8 @@ public class MissionLoigc { count = user.getPlayerInfoManager().getMaxForce(); break; case USER_CONSUMER_GEM: - count=cumulationData.getConsumeGem(); + Long consumeGem = cumulationData.getConsumeGem(); + count = consumeGem.intValue(); break; case USER_WORKSHOP_LEVEL: count =user.getWorkShopController().getWorkShopLevel(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/ConsumerMaterialDataManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/ConsumerMaterialDataManager.java index 5d5464720..f8d07dd3b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/ConsumerMaterialDataManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/ConsumerMaterialDataManager.java @@ -16,7 +16,7 @@ public class ConsumerMaterialDataManager implements BaseDataManager{ if(missionType == MissionType.USER_CONSUMER_GEM){ count = consumeMaterialMapTmp.get(Global.GEM); if(count!=null){ - data.setConsumeGem(data.getConsumeGem() + count.intValue()); + data.setConsumeGem(data.getConsumeGem() + count); result = new CumulationData.Result(missionType); } }else if(missionType == MissionType.USER_CONSUMER_STAMINA){