From 2b06b9ace00f3ec8be42c4bf03992196a7d99835 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Fri, 22 Mar 2019 17:43:20 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E9=A9=BB=E6=89=8E=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/fight/CombatLogic.java | 2 +- .../src/main/java/com/ljsd/jieling/util/CBean2Proto.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java index 8e869213f..3870f7604 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java @@ -207,7 +207,7 @@ public class CombatLogic { totalForce += HeroLogic.getInstance().calHeoForce(user,hero); } - adventureManager.station(new AdventureStateInfo(position,heroIds,(int)(System.currentTimeMillis()),hourDuration,totalForce,myRecommendHeroSize),allowTime); + adventureManager.station(new AdventureStateInfo(position,heroIds,(int)(System.currentTimeMillis()/1000),hourDuration,totalForce,myRecommendHeroSize),allowTime); //发送成功 MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.ADVENTURE_STATION_RESPONSE_VALUE,null,true); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java index a2d06133a..ef9640d47 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -84,7 +84,8 @@ public class CBean2Proto { if(adventureStateInfo!=null){ int startTime = adventureStateInfo.getStartTime(); int now = (int)(System.currentTimeMillis()/1000); - builder.setPositionId(adventureStateInfo.getPosition()) + builder.addAllHeroIdList(adventureStateInfo.getHeroIds()) + .setHourDuration(adventureStateInfo.getHourDuration()) .setRemainTime((now - startTime )); } return builder.build();