From 7f7ec207f9c928366296495fa25c0f96566508d3 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Tue, 12 Nov 2019 16:33:40 +0800 Subject: [PATCH 1/4] fix online reward --- .../java/com/ljsd/jieling/network/server/ProtocolsManager.java | 1 - .../main/java/com/ljsd/jieling/network/session/ISession.java | 1 - serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) 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){ From 38236142b3b7a695c8614f8f69e03a19ce86bdc2 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Tue, 12 Nov 2019 17:41:28 +0800 Subject: [PATCH 2/4] fix arena --- .../main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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..1f6c75691 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 @@ -170,7 +170,7 @@ public class ArenaLogic { int myscoreChange=0; int defScoreChange=0; - if(arenaManager.getCount() != 0) { + if(arenaManager.getSeason()==curSeason) { myscore = RedisUtil.getInstence().getZSetScore(RedisKey.ARENA_RANK, Integer.toString(curSeason), Integer.toString(uid)).intValue(); } user.getTeamPosManager().setCurTeamPosId(teamId); @@ -189,7 +189,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().getSeason() == curSeason){ arenaRecord.setAttackId(uid); arenaRecord.setDefScore(defScoreChange); arenaRecord.setAttackForce( HeroLogic.getInstance().calTeamTotalForce(user, GlobalsDef.TEAM_ARENA_DEFENSE,false)); From 4d13d9eac80c608fb37bd124fb9f65ff36334044 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Tue, 12 Nov 2019 17:56:30 +0800 Subject: [PATCH 3/4] fix arena --- .../main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 1f6c75691..b3353588e 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 @@ -170,7 +170,7 @@ public class ArenaLogic { int myscoreChange=0; int defScoreChange=0; - if(arenaManager.getSeason()==curSeason) { + 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 +189,7 @@ public class ArenaLogic { } defScoreChange = calScore(defScore, myscore,fightResult==1?0:1); myscoreChange = calScore(myscore, defScore,fightResult); - if(defUser.getArenaManager().getSeason() == curSeason){ + 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)); From 2a2c0d921ba87599eaf83e3a117d2d1d1a23488b Mon Sep 17 00:00:00 2001 From: wangyuan Date: Tue, 12 Nov 2019 18:14:09 +0800 Subject: [PATCH 4/4] del record --- .../src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java | 1 + 1 file changed, 1 insertion(+) 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 b3353588e..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){