diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java index 69244c1e2..75410d988 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java @@ -74,6 +74,7 @@ public class ArenaLogic { ArenaManager arenaManager = user.getArenaManager(); if(arenaManager.getSeason()!=curSeason){ arenaManager.resetSeason(curSeason); + RedisUtil.getInstence().del(RedisKey.ARENA_RRECORD,Integer.toString(uid)); } int score = RedisUtil.getInstence().getZSetScore(RedisKey.ARENA_RANK,Integer.toString(curSeason), Integer.toString(uid)).intValue(); if(score == -1){ @@ -170,7 +171,7 @@ public class ArenaLogic { int myscoreChange=0; int defScoreChange=0; - if(arenaManager.getCount() != 0) { + if(arenaManager.getCount()!=0 && arenaManager.getSeason()==curSeason) { myscore = RedisUtil.getInstence().getZSetScore(RedisKey.ARENA_RANK, Integer.toString(curSeason), Integer.toString(uid)).intValue(); } user.getTeamPosManager().setCurTeamPosId(teamId); @@ -189,7 +190,7 @@ public class ArenaLogic { } defScoreChange = calScore(defScore, myscore,fightResult==1?0:1); myscoreChange = calScore(myscore, defScore,fightResult); - if(defUser.getArenaManager().getCount()!=0){ + if(defUser.getArenaManager().getCount()!=0 && defUser.getArenaManager().getSeason() == curSeason){ arenaRecord.setAttackId(uid); arenaRecord.setDefScore(defScoreChange); arenaRecord.setAttackForce( HeroLogic.getInstance().calTeamTotalForce(user, GlobalsDef.TEAM_ARENA_DEFENSE,false)); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java b/serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java index 9e8e50caf..003a33210 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java @@ -354,7 +354,6 @@ public class ProtocolsManager implements ProtocolsAbstract { } }else { iSession.setIndex(index); - iSession.setLoginTime(System.currentTimeMillis()); } return 0; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/network/session/ISession.java b/serverlogic/src/main/java/com/ljsd/jieling/network/session/ISession.java index 11b54a3bf..a1d275692 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/network/session/ISession.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/network/session/ISession.java @@ -113,7 +113,6 @@ public class ISession extends NettyGameSession { public void putBackIndicationToMap(int index,byte[] backMessage){ this.indexToIndication.putIfAbsent(index,new IndicationMsg(TimeUtils.now(),backMessage)); - System.out.println(index); } public void clearIndication(int ackId){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index 35ed3e561..7c50587a0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -271,7 +271,7 @@ public class ItemUtil { Integer itemId = item.getKey(); Integer value = item.getValue(); SItem sItem = SItem.getsItemMap().get(itemId); - int itemNums = privilegeAdd(user, resson, sItem.getItemType(), value); + int itemNums = privilegeAdd(user, resson, sItem.getId(), value); Item hadItem = itemManager.getItem(itemId); int hadNums = 0; if(hadItem !=null){