From 77212a2f30c9e34ca3609378fb1f815da0c72482 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Thu, 7 Mar 2019 15:00:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E4=B8=89=E4=B8=AA?= =?UTF-8?q?=E7=BC=96=E9=98=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/common/mogodb/BeanUtil.java | 13 +++++++------ .../com/ljsd/jieling/logic/dao/TeamPosManager.java | 2 ++ .../java/com/ljsd/jieling/logic/hero/HeroLogic.java | 9 +++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/common/src/main/java/com/ljsd/common/mogodb/BeanUtil.java b/common/src/main/java/com/ljsd/common/mogodb/BeanUtil.java index d21c52f8d..b1800fdcd 100644 --- a/common/src/main/java/com/ljsd/common/mogodb/BeanUtil.java +++ b/common/src/main/java/com/ljsd/common/mogodb/BeanUtil.java @@ -249,14 +249,15 @@ public class BeanUtil { } Object key = getKey(entry.getKey(), (Class)types[0]); map.put(key,objects); - return map; - } - - Object obj = getObj(entry.getValue(), (Class)type); + }else{ + Object obj = getObj(entry.getValue(), (Class)type); // Object value = ((Class)types[1]).newInstance(); // Object obj = dbObject2Bean((DBObject) entry.getValue(), value, root); - Object key = getKey(entry.getKey(), (Class)types[0]); - map.put(key, obj); + Object key = getKey(entry.getKey(), (Class)types[0]); + map.put(key, obj); + } + + } return map; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/TeamPosManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/TeamPosManager.java index 44cdb0a35..e891c19bb 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/TeamPosManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/TeamPosManager.java @@ -55,6 +55,8 @@ public class TeamPosManager extends MongoBase { teamPosHeroInfoList.add(teamPosHeroInfo); } teamPosForHero.put(1,teamPosHeroInfoList); + teamPosForHero.put(2,new ArrayList<>(1)); + teamPosForHero.put(3,new ArrayList<>(1)); updateString("teamPosForHero",teamPosForHero); } 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 09f84a681..b908bb139 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 @@ -586,11 +586,8 @@ public class HeroLogic { Integer propertyId = item.getKey(); Integer propertyValue = item.getValue(); SPropertyConfig sPropertyConfig = SPropertyConfig.getsPropertyConfigByPID(propertyId); - int style = sPropertyConfig.getStyle(); float score = sPropertyConfig.getScore(); - if(style == GlobalsDef.PERCENT_TYPE){ - score = score/100; - } + LOGGER.info("the value is ={},propertyValue={},score={}",propertyValue*score,propertyValue,score); result += propertyValue*score; } @@ -602,7 +599,7 @@ public class HeroLogic { Integer propertyId = item.getKey(); Integer propertyValue = item.getValue(); if(heroAttributeMap.containsKey(propertyId)){ - propertyValue = heroAttributeMap.get(propertyId); + propertyValue += heroAttributeMap.get(propertyId); } heroAttributeMap.put(propertyId,propertyValue); } @@ -636,7 +633,7 @@ public class HeroLogic { hero.updateEquipPositionMap(position,equipId); - //LOGGER.info("the heroTid={},the force={}",calHeoForce(user,hero)); + LOGGER.info("the heroTid={},the force={}",calHeoForce(user,hero)); //发送成功消息 MessageUtil.sendMessage(session,1,MessageTypeProto.MessageType.EQUIP_WEAR_RESPONSE_VALUE,null,true);