root
/
miduo_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

删除无效日志

back_recharge
wangyuan 2019-08-13 10:07:57 +08:00
parent 4cdb969929
commit 480936bdc5
5 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
serverlogic/src/main/java/com/ljsd/jieling/config/SGlobalActivity.java
View File

@ -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;
}

2
serverlogic/src/main/java/com/ljsd/jieling/config/SRechargeCommodityConfig.java
View File

@ -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;
}

2
serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuildMyInfo.java
View File

@ -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;

11
serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java
View File

@ -66,6 +66,7 @@ public class GuildLogic {
for(Set<Integer> 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) {

8
serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
View File

@ -948,12 +948,12 @@ public class HeroLogic {
Equip equip = equipManager.getEquipMap().get(equipId);
Map<Integer, Integer> propertyValueByIdMap = equip.getPropertyValueByIdMap();
Map<Integer, Integer> 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<Integer, Pokemon> 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);