From 1c28ff479764a9fb37f9ede23a4a0741e530c49b Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Mon, 22 Nov 2021 14:23:18 +0800 Subject: [PATCH] =?UTF-8?q?=E9=81=93=E5=85=B7=E6=95=B0=E9=87=8F=E6=94=B9lo?= =?UTF-8?q?ng?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/dao/CumulationData.java | 2 +- .../main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 2 +- .../jieling/logic/mission/data/ItemUseDataManager.java | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) 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 4a16f1744..a65768f16 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 @@ -142,7 +142,7 @@ public class CumulationData { public int ten_challenge_time;// 挑战十绝阵num次 // public Map finisin_daily_challenge_times;//完成type(0不限、1金币、2武将经验、3武将碎片、4兵魂、5谋略)的日常副本num次 public Map expedition_floor_times= new HashMap<>();//猎妖之路通过floor层num次 - public Map itemUse = new HashMap<>(); //货币道具消耗 + public Map itemUse = new HashMap<>(); //货币道具消耗 public int decompose_times;//献祭武将次数 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 2bb04fffc..432d29d4a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -3184,7 +3184,7 @@ public class HeroLogic { // float mdScore = sPropertyConfigMagicDefence.getScore(); // // float xishu = 10000; - float finalHp = heroAllAttribute.getOrDefault(HeroAttributeEnum.Hp.getPropertyId(), 0L).floatValue(); +// float finalHp = heroAllAttribute.getOrDefault(HeroAttributeEnum.Hp.getPropertyId(), 0L).floatValue(); // // 面板攻击 // float finalAttack = heroAllAttribute.getOrDefault(HeroAttributeEnum.Attack.getPropertyId(), 0L).floatValue(); // // 面板护甲 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/ItemUseDataManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/ItemUseDataManager.java index 68e3c9356..f83b4c954 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/ItemUseDataManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/ItemUseDataManager.java @@ -17,8 +17,8 @@ public class ItemUseDataManager extends AbstractDataManager { if(parm.length==1&&parm[0] instanceof Map){ ((Map)parm[0]).forEach((o, o2) -> { int type =(int)o; - int count =(int)o2; - data.itemUse.merge(type,count,Integer::sum); + long count =(Long)o2; + data.itemUse.merge(type,count,Long::sum); }); } return new CumulationData.Result(missionType); @@ -26,12 +26,12 @@ public class ItemUseDataManager extends AbstractDataManager { @Override public boolean isFinish(User user, CumulationData data, int[][] cfgValue, Object... parm) { - Integer orDefault = data.itemUse.getOrDefault(cfgValue[0][0], 0); + Integer orDefault = data.itemUse.getOrDefault(cfgValue[0][0], 0L).intValue(); return orDefault>=cfgValue[1][0]; } @Override public int getProcess(User user, CumulationData data, int[] missionSubType) { - return data.itemUse.getOrDefault(missionSubType[0], 0); + return data.itemUse.getOrDefault(missionSubType[0], 0L).intValue(); } }