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
lvxinran 2019-11-13 11:07:04 +08:00
parent fe098a2443 2a2c0d921b
commit d93f8c2242
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java
View File

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

1
serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java
View File

@ -354,7 +354,6 @@ public class ProtocolsManager implements ProtocolsAbstract {
}
}else {
iSession.setIndex(index);
iSession.setLoginTime(System.currentTimeMillis());
}
return 0;
}

1
serverlogic/src/main/java/com/ljsd/jieling/network/session/ISession.java
View File

@ -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){

2
serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java
View File

@ -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){