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

Merge branch 'master' of http://60.1.1.230/backend/jieling_server

back_recharge
zhangshanxue 2019-10-22 11:59:36 +08:00
parent bfdddc8158 21b79fcf03
commit 6f4f669923
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java
View File

@ -17,6 +17,8 @@ import config.SPlayerLevelConfig;
import manager.STableManager;
import util.TimeUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@ -83,7 +85,9 @@ public class UserManager {
HeroManager heroManager = user.getHeroManager();
Map<String, Hero> heroMap = heroManager.getHeroMap();
TeamPosManager teamPosManager = user.getTeamPosManager();
teamPosManager.addTeamOfInitPlayer(heroMap.values());
List<Hero> teamHeros = new ArrayList<>(1);
teamHeros.add(heroMap.values().iterator().next());
teamPosManager.addTeamOfInitPlayer(teamHeros);
int force = HeroLogic.getInstance().calTeamTotalForce(user, 1, true);
playerManager.setMaxForce(force);
PlayerLogic.getInstance().vipflushEveryDay(user,null);

36
serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java
View File

@ -354,15 +354,15 @@ public class GuildFightLogic {
RedisUtil redisUtil = RedisUtil.getInstence();
Set<Integer> guildIds = GuilidManager.guildInfoMap.keySet();
for (Integer gid : guildIds) {
GuildInfo guildInfo = GuilidManager.guildInfoMap.get(gid);
int enemyFamily = getEnemyFamily(guildInfo.getId());
int enemyFamily = getEnemyFamily(gid);
if (enemyFamily == -1) {
continue;
}
GuildInfo guildInfo = GuilidManager.guildInfoMap.get(gid);
GuildCache enemyInfo = RedisUtil.getInstence().getMapEntry(RedisKey.FAMILY_INFO, "", String.valueOf(enemyFamily), GuildCache.class);
// GuildInfo enemyInfo = GuilidManager.guildInfoMap.get(enemyFamily);
Family.EnemyFamily familyInfo = Family.EnemyFamily.newBuilder().setId(enemyFamily)
.setLevel(enemyInfo.getLevel())
.setLevel(enemyInfo.getLevel())
.setName(enemyInfo.getName())
.setPictureId(enemyInfo.getIcon())
.setTotalStar(redisUtil.getMapEntry(RedisKey.FAMILY_FIGHT_TOTAL_STAR,"",String.valueOf(enemyFamily),Integer.class))
@ -562,12 +562,12 @@ public class GuildFightLogic {
.setRoundEndTime(roundEndTime)
.setAttackCount(attackCount)
.setJoinType(1);
if(guildId==0){
response.setType(-1);
response.setRoundEndTime((int) (TimeUtils.getAppointTime(sGuildSetting.getSettleTime()[1][0], sGuildSetting.getSettleTime()[1][1]) / 1000));
MessageUtil.sendMessage(session, 1, messageType.getNumber(), response.build(), true);
return;
}
// if(guildId==0){
// response.setType(-1);
// response.setRoundEndTime((int) (TimeUtils.getAppointTime(sGuildSetting.getSettleTime()[1][0], sGuildSetting.getSettleTime()[1][1]) / 1000));
// MessageUtil.sendMessage(session, 1, messageType.getNumber(), response.build(), true);
// return;
// }
if (enemyFamily != -1) {
GuildCache enemyInfo = RedisUtil.getInstence().getMapEntry(RedisKey.FAMILY_INFO, "", String.valueOf(enemyFamily), GuildCache.class);
// GuildInfo guildInfo = GuilidManager.guildInfoMap.get(enemyFamily);
@ -583,19 +583,21 @@ public class GuildFightLogic {
response.setEnemy(familyInfo);
}
}else{
if(status!=0&&status!=1){
if(!startMatching){
if(status!=0){
if(!startMatching&&status!=1){
response.setType(-1);
response.setRoundEndTime((int) (TimeUtils.getAppointTime(sGuildSetting.getSettleTime()[1][0], sGuildSetting.getSettleTime()[1][1]) / 1000));
}
//todo 人数限制
if(guildId!=0){
Map<Integer, SGuildLevelConfig> configMap = STableManager.getConfig(SGuildLevelConfig.class);
if(GuilidManager.guildInfoMap.get(guildId).getDefendInfo().size()<configMap.get(GuilidManager.guildInfoMap.get(guildId).getLevel()).getDefendNum()){
response.setType(-1);
response.setRoundEndTime((int) (TimeUtils.getAppointTime(sGuildSetting.getSettleTime()[1][0], sGuildSetting.getSettleTime()[1][1]) / 1000));
}
}
}
}
//todo 人数限制
Map<Integer, SGuildLevelConfig> configMap = STableManager.getConfig(SGuildLevelConfig.class);
if(GuilidManager.guildInfoMap.get(guildId).getDefendInfo().size()<configMap.get(GuilidManager.guildInfoMap.get(guildId).getLevel()).getDefendNum()){
response.setType(-1);
response.setRoundEndTime((int) (TimeUtils.getAppointTime(sGuildSetting.getSettleTime()[1][0], sGuildSetting.getSettleTime()[1][1]) / 1000));
}
if(GuilidManager.guildInfoMap.get(guildId)!=null){
long createTime = GuilidManager.guildInfoMap.get(guildId).getCreateTime();
if(createTime/1000>roundStartTime&&createTime/1000<roundEndTime){