From 480936bdc587503b8ead47c8489cfdf33e7174c5 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Tue, 13 Aug 2019 10:07:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E6=95=88=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/config/SGlobalActivity.java | 2 +- .../ljsd/jieling/config/SRechargeCommodityConfig.java | 2 +- .../java/com/ljsd/jieling/logic/dao/GuildMyInfo.java | 2 +- .../com/ljsd/jieling/logic/family/GuildLogic.java | 11 ++++++++++- .../java/com/ljsd/jieling/logic/hero/HeroLogic.java | 8 ++++---- 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SGlobalActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SGlobalActivity.java index 7dbf64db4..9a70ffd30 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SGlobalActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SGlobalActivity.java @@ -93,7 +93,7 @@ public class SGlobalActivity implements BaseConfig { long serverOpenTime = GameApplication.serverConfig.getCacheOpenTime(); startTime = serverOpenTime + baseTime*1000; }else if(time == ActivityType.OPEN_TYPE_ROLE){ - startTime =createUserTime+baseTime*1000; + startTime = TimeUtils.getAppointTimeInXDay(createUserTime,0) + baseTime*1000; } return startTime; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SRechargeCommodityConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SRechargeCommodityConfig.java index 56f567540..437e80bdc 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SRechargeCommodityConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SRechargeCommodityConfig.java @@ -108,7 +108,7 @@ public class SRechargeCommodityConfig implements BaseConfig { long serverOpenTime = GameApplication.serverConfig.getCacheOpenTime(); startTime = serverOpenTime + baseTime*1000; }else if(time == ActivityType.OPEN_TYPE_ROLE){ - startTime =createUserTime+baseTime*1000; + startTime = TimeUtils.getAppointTimeInXDay(createUserTime,0)+baseTime*1000; } return startTime; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuildMyInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuildMyInfo.java index c6c830fa2..004edde0b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuildMyInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuildMyInfo.java @@ -8,7 +8,7 @@ import java.util.ArrayList; import java.util.List; public class GuildMyInfo extends MongoBase { - private static int speed = 500; + private static int speed = 200; private static int initPos = 0; 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 000acaecf..66d496e09 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 @@ -66,6 +66,7 @@ public class GuildLogic { for(Set members : guildInfo.getMembers().values()){ for(int uidOfMember : members){ User userMember = UserManager.getUser(uidOfMember); + userMember.getGuildMyInfo().move(System.currentTimeMillis()); builder.addFamilyWalkIndicaiton(CBean2Proto.getFamilyWalkIndicaiton(userMember)); } } @@ -231,6 +232,7 @@ public class GuildLogic { addGuildLog(guildInfo.getId(),GuildDef.Log.JOIN,user.getPlayerInfoManager().getNickName()); Family.FamilyJoinIndicaion build = Family.FamilyJoinIndicaion.newBuilder().setFamilyBaseInfo(CBean2Proto.getFamilyBaseInfo(guildInfo)).setFamilyUserInfo(CBean2Proto.getFamilyUserInfo(user, GlobalsDef.MEMBER)).build(); Family.FamilyJoinResponse response = Family.FamilyJoinResponse.newBuilder().setFamilyJoinIndicaion(build).build(); + MessageUtil.sendMessage(session,1,msgId,response,true); } @@ -400,6 +402,8 @@ public class GuildLogic { targetUser.getPlayerInfoManager().setGuildId(guildInfo.getId()); GuilidManager.removeMineApplyGuildInfos(guildInfo.getId(),applyId); GuilidManager.removeOneApplyGuildInfos(guildInfo.getId(),applyId); + Family.FamilyWalkIndicaiton familyWalkIndicaiton = CBean2Proto.getFamilyWalkIndicaiton(targetUser); + sendIndicationToMember(guildInfo, MessageTypeProto.MessageType.FAMILY_WALK_INDICATION,familyWalkIndicaiton); }catch (Exception e){ LOGGER.error("the exception={}",e); }finally { @@ -703,16 +707,21 @@ public class GuildLogic { return; } GuildMyInfo guildMyInfo = user.getGuildMyInfo(); - LOGGER.info("cur ={},path={}",guildMyInfo.getCurPos(),path); + + + user.getGuildMyInfo().move(System.currentTimeMillis()); + LOGGER.info("old ={},path={}",guildMyInfo.getCurPos(),path); boolean continuous = CellUtil.isContinuous(guildMyInfo.getCurPos(),path); if(!continuous){ MessageUtil.sendErrorResponse(session,0,msgId,"路线有误"); return; } user.getGuildMyInfo().move(path); + LOGGER.info("cur ={},path={}",guildMyInfo.getCurPos(),path); Family.FamilyWalkIndicaiton familyWalkIndicaiton = CBean2Proto.getFamilyWalkIndicaiton(user); GuildInfo guildInfo = GuilidManager.guildInfoMap.get(guildId); sendIndicationToMember(guildInfo, MessageTypeProto.MessageType.FAMILY_WALK_INDICATION,familyWalkIndicaiton); + MessageUtil.sendMessage(session,1,msgId,null,true); } public static void updateMyPos(User user) { 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 6eb593782..b1523d79f 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 @@ -948,12 +948,12 @@ public class HeroLogic { Equip equip = equipManager.getEquipMap().get(equipId); Map propertyValueByIdMap = equip.getPropertyValueByIdMap(); Map secondValueByIdMap = equip.getSecondValueByIdMap(); - LOGGER.info("cal equip = {}",equip.getEquipId()); + // LOGGER.info("cal equip = {}",equip.getEquipId()); combinedAttribute(propertyValueByIdMap,heroAllAttribute); combinedAttribute(secondValueByIdMap,heroAllAttribute); SEquipConfig sEquipConfig = SEquipConfig.getsEquipConfigById(equip.getEquipId()); equipForce+=sEquipConfig.getScore(); - LOGGER.info("cal equip = {} end",equip.getEquipId()); + // LOGGER.info("cal equip = {} end",equip.getEquipId()); } //天赋异妖加成 Map ringFireMap = pokemonManager.getRingFireMap(); @@ -1015,7 +1015,7 @@ public class HeroLogic { heroAllAttribute.put(HeroAttributeEnum.CurHP.getPropertyId(),heroAllAttribute.get(GlobalsDef.HP_TYPE)); //装备战力保存 heroAllAttribute.put(HeroAttributeEnum.EquipForce.getPropertyId(),equipForce); - LOGGER.info("cal herotid = {},end",hero.getTemplateId()); + // LOGGER.info("cal herotid = {},end",hero.getTemplateId()); return heroAllAttribute; } @@ -1116,7 +1116,7 @@ public class HeroLogic { Integer propertyId = item.getKey(); float propertyValue = item.getValue(); if(propertyId == HeroAttributeEnum.EquipForce.getPropertyId()){ - LOGGER.info("the equipScore={}",propertyValue); + // LOGGER.info("the equipScore={}",propertyValue); continue; } SPropertyConfig sPropertyConfig = SPropertyConfig.getsPropertyConfigByPID(propertyId);