热更新
parent
3ab0b9c3a8
commit
2268fdbf5a
|
@ -6,12 +6,16 @@ import com.ljsd.jieling.logic.activity.event.FunctionRefreshEvent;
|
|||
import com.ljsd.jieling.logic.activity.event.Poster;
|
||||
import com.ljsd.jieling.logic.championship.ChampionshipLogic;
|
||||
import com.ljsd.jieling.logic.dao.TimeControllerOfFunction;
|
||||
import util.TimeUtils;
|
||||
|
||||
public class ChampionFunction implements FunctionManager {
|
||||
@Override
|
||||
public void startAction(TimeControllerOfFunction timeControllerOfFunction) throws Exception {
|
||||
// ChampionshipLogic.start();
|
||||
// Poster.getPoster().dispatchEvent(new FunctionRefreshEvent(FunctionIdEnum.Arena.getFunctionType(),-1));
|
||||
if(TimeUtils.now() - timeControllerOfFunction.getStartTime()>1000*60*3 ){
|
||||
return;
|
||||
}
|
||||
ChampionshipLogic.start();
|
||||
Poster.getPoster().dispatchEvent(new FunctionRefreshEvent(FunctionIdEnum.Arena.getFunctionType(),-1));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
package com.ljsd.jieling.handler.GameGM;
|
||||
|
||||
import com.ljsd.GameApplication;
|
||||
import com.ljsd.GmService;
|
||||
import com.ljsd.jieling.chat.logic.ChatLogic;
|
||||
import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig;
|
||||
import com.ljsd.jieling.config.clazzStaticCfg.HeroStaticConfig;
|
||||
import com.ljsd.jieling.core.GlobalsDef;
|
||||
|
@ -35,7 +37,10 @@ import org.springframework.stereotype.Component;
|
|||
import util.StringUtil;
|
||||
import util.TimeUtils;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.PrintWriter;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
@ -56,13 +61,26 @@ public class GMRequestHandler extends BaseHandler{
|
|||
byte[] message = netData.parseClientProtoNetData();
|
||||
CommonProto.GMCommand gmCommand = CommonProto.GMCommand.parseFrom(message);
|
||||
String command = gmCommand.getCommand();
|
||||
LOGGER.info("gm commond is {}",command);
|
||||
int uid = iSession.getUid();
|
||||
LOGGER.error("gm commond is {}",command);
|
||||
if(command.startsWith("//")){
|
||||
PrintWriter printWriter = new PrintWriter(new FileOutputStream( new File(SysUtil.getPath("conf/check_fight" + uid + ".txt"))));
|
||||
printWriter.print(command);
|
||||
printWriter.flush();
|
||||
printWriter.close();
|
||||
CommonProto.GmResponse.Builder gmBuilder = CommonProto.GmResponse.newBuilder();
|
||||
MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.GM_RESPONSE_VALUE, gmBuilder.build(), true);
|
||||
return;
|
||||
}
|
||||
if(!GameApplication.serverProperties.isDebug()){
|
||||
CommonProto.GmResponse.Builder gmBuilder = CommonProto.GmResponse.newBuilder();
|
||||
MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.GM_RESPONSE_VALUE, gmBuilder.build(), true);
|
||||
}
|
||||
if (!command.contains("#") || command.split("#").length < 3) {
|
||||
LOGGER.error("wrong command :" + command);
|
||||
return;
|
||||
}
|
||||
String[] commandArray = command.split("#");
|
||||
int uid = iSession.getUid();
|
||||
int gmCommandType = Integer.parseInt(commandArray[0]);// 1:道具(type#数量) 2: 卡牌
|
||||
int prarm1 = 0, prarm2 = 0;
|
||||
String prarm3 = "";
|
||||
|
|
|
@ -1,20 +1,24 @@
|
|||
package com.ljsd.jieling.handler.champion;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import com.ljsd.jieling.core.GlobalsDef;
|
||||
import com.ljsd.jieling.db.redis.RedisKey;
|
||||
import com.ljsd.jieling.db.redis.RedisUtil;
|
||||
import com.ljsd.jieling.handler.BaseHandler;
|
||||
import com.ljsd.jieling.logic.championship.ChampionshipLogic;
|
||||
import com.ljsd.jieling.logic.dao.ArenaRecord;
|
||||
import com.ljsd.jieling.logic.dao.UserManager;
|
||||
import com.ljsd.jieling.logic.dao.*;
|
||||
import com.ljsd.jieling.logic.dao.root.User;
|
||||
import com.ljsd.jieling.logic.player.PlayerLogic;
|
||||
import com.ljsd.jieling.netty.cocdex.PacketNetData;
|
||||
import com.ljsd.jieling.network.session.ISession;
|
||||
import com.ljsd.jieling.protocols.ArenaInfoProto;
|
||||
import com.ljsd.jieling.protocols.CommonProto;
|
||||
import com.ljsd.jieling.protocols.MessageTypeProto;
|
||||
import com.ljsd.jieling.util.MessageUtil;
|
||||
import config.SArenaRobotConfig;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* * 告知前端基本信息
|
||||
|
@ -129,12 +133,89 @@ public class ChampinGetHandler extends BaseHandler {
|
|||
|
||||
}
|
||||
|
||||
|
||||
|
||||
builder.setProcess(state);
|
||||
|
||||
SArenaRobotConfig sArenaRobotConfig = SArenaRobotConfig.getsArenaRobotConfigById(arenaRecord.getAttackId());
|
||||
if (sArenaRobotConfig != null) {
|
||||
builder1.setMyInfo( PlayerLogic.getInstance().getRobotTeamInfo(sArenaRobotConfig)) ;
|
||||
}else {
|
||||
ChampionshipLogic.MemberInfo memberInfo = RedisUtil.getInstence().getMapEntry(RedisKey.CHAMPION_JOIN, "", Integer.toString(arenaRecord.getAttackId()), ChampionshipLogic.MemberInfo.class);
|
||||
FamilyFightInfo fightInfo = memberInfo.getFightInfo();
|
||||
if(fightInfo == null){
|
||||
builder1.setMyInfo( PlayerLogic.getInstance().getUserTeamOneInfo(arenaRecord.getAttackId(), GlobalsDef.CHAMPION_TEAM));
|
||||
}else {
|
||||
//fix 整个过程都不能调整编队
|
||||
|
||||
User user = UserManager.getUser(arenaRecord.getAttackId());
|
||||
PlayerManager playerManager = user.getPlayerInfoManager();
|
||||
CommonProto.TeamOneInfo.Builder oneInfo = CommonProto.TeamOneInfo.newBuilder()
|
||||
.setHead(playerManager.getHead())
|
||||
.setHeadFrame(playerManager.getHeadFrame())
|
||||
.setLevel(playerManager.getLevel())
|
||||
.setName(playerManager.getNickName()).setUid(arenaRecord.getAttackId());
|
||||
CommonProto.TeamOneTeamInfo.Builder teamInfo = CommonProto.TeamOneTeamInfo.newBuilder();
|
||||
teamInfo.setTotalForce(fightInfo.getForce());
|
||||
if (!fightInfo.getPokenmonIds().isEmpty()) {
|
||||
teamInfo.addAllPokemonInfos(fightInfo.getPokenmonIds());
|
||||
}
|
||||
|
||||
// int i = 1;
|
||||
for (Map.Entry<String, FamilyHeroInfo> entry : fightInfo.getHeroAttribute().entrySet()) {
|
||||
FamilyHeroInfo familyHeroInfo = entry.getValue();
|
||||
teamInfo.addTeam(CommonProto.TeamSimpleInfo.newBuilder()
|
||||
.setHeroid(entry.getKey())
|
||||
.setHeroTid(familyHeroInfo.getTempleteId())
|
||||
.setStar(familyHeroInfo.getStar())
|
||||
.setLevel(familyHeroInfo.getLevel())
|
||||
.setPosition(familyHeroInfo.getPosition())
|
||||
.build()
|
||||
);
|
||||
}
|
||||
oneInfo.setTeam(teamInfo);
|
||||
builder1.setMyInfo(oneInfo);
|
||||
}
|
||||
}
|
||||
|
||||
sArenaRobotConfig= SArenaRobotConfig.getsArenaRobotConfigById(arenaRecord.getDefUid());
|
||||
if (sArenaRobotConfig != null) {
|
||||
builder1.setEnemyInfo( PlayerLogic.getInstance().getRobotTeamInfo(sArenaRobotConfig)) ;
|
||||
}else {
|
||||
ChampionshipLogic.MemberInfo memberInfo = RedisUtil.getInstence().getMapEntry(RedisKey.CHAMPION_JOIN, "", Integer.toString(arenaRecord.getDefUid()), ChampionshipLogic.MemberInfo.class);
|
||||
FamilyFightInfo fightInfo = memberInfo.getFightInfo();
|
||||
if(fightInfo == null){
|
||||
builder1.setEnemyInfo( PlayerLogic.getInstance().getUserTeamOneInfo(arenaRecord.getDefUid(), GlobalsDef.CHAMPION_TEAM));
|
||||
}else {
|
||||
//fix 整个过程都不能调整编队
|
||||
|
||||
User user = UserManager.getUser(arenaRecord.getDefUid());
|
||||
PlayerManager playerManager = user.getPlayerInfoManager();
|
||||
CommonProto.TeamOneInfo.Builder oneInfo = CommonProto.TeamOneInfo.newBuilder()
|
||||
.setHead(playerManager.getHead())
|
||||
.setHeadFrame(playerManager.getHeadFrame())
|
||||
.setLevel(playerManager.getLevel())
|
||||
.setName(playerManager.getNickName()).setUid(arenaRecord.getDefUid());
|
||||
CommonProto.TeamOneTeamInfo.Builder teamInfo = CommonProto.TeamOneTeamInfo.newBuilder();
|
||||
teamInfo.setTotalForce(fightInfo.getForce());
|
||||
if (!fightInfo.getPokenmonIds().isEmpty()) {
|
||||
teamInfo.addAllPokemonInfos(fightInfo.getPokenmonIds());
|
||||
}
|
||||
|
||||
// int i = 1;
|
||||
for (Map.Entry<String, FamilyHeroInfo> entry : fightInfo.getHeroAttribute().entrySet()) {
|
||||
FamilyHeroInfo familyHeroInfo = entry.getValue();
|
||||
teamInfo.addTeam(CommonProto.TeamSimpleInfo.newBuilder()
|
||||
.setHeroid(entry.getKey())
|
||||
.setHeroTid(familyHeroInfo.getTempleteId())
|
||||
.setStar(familyHeroInfo.getStar())
|
||||
.setLevel(familyHeroInfo.getLevel())
|
||||
.setPosition(familyHeroInfo.getPosition())
|
||||
.build()
|
||||
);
|
||||
}
|
||||
oneInfo.setTeam(teamInfo);
|
||||
builder1.setEnemyInfo(oneInfo);
|
||||
}}
|
||||
builder.setChampionBattleInfo(builder1
|
||||
.setMyInfo(ChampionshipLogic.getChampionBattleInfo(attackId))
|
||||
.setEnemyInfo(ChampionshipLogic.getChampionBattleInfo(enemyId))
|
||||
.setResult(fightResult)
|
||||
.build());
|
||||
}
|
||||
|
|
|
@ -1,17 +1,21 @@
|
|||
package com.ljsd.jieling.handler.champion;
|
||||
|
||||
import com.ljsd.jieling.core.GlobalsDef;
|
||||
import com.ljsd.jieling.db.redis.RedisKey;
|
||||
import com.ljsd.jieling.db.redis.RedisUtil;
|
||||
import com.ljsd.jieling.exception.ErrorCode;
|
||||
import com.ljsd.jieling.exception.ErrorCodeException;
|
||||
import com.ljsd.jieling.handler.BaseHandler;
|
||||
import com.ljsd.jieling.logic.championship.ChampionshipLogic;
|
||||
import com.ljsd.jieling.logic.dao.ArenaRecord;
|
||||
import com.ljsd.jieling.logic.dao.*;
|
||||
import com.ljsd.jieling.logic.dao.root.User;
|
||||
import com.ljsd.jieling.logic.player.PlayerLogic;
|
||||
import com.ljsd.jieling.network.session.ISession;
|
||||
import com.ljsd.jieling.protocols.ArenaInfoProto;
|
||||
import com.ljsd.jieling.protocols.CommonProto;
|
||||
import com.ljsd.jieling.protocols.MessageTypeProto;
|
||||
import com.ljsd.jieling.util.MessageUtil;
|
||||
import config.SArenaRobotConfig;
|
||||
import util.StringUtil;
|
||||
|
||||
import java.util.List;
|
||||
|
@ -41,18 +45,19 @@ public class ChampionBetInfoHandler extends BaseHandler<ArenaInfoProto.ChampionG
|
|||
builder.setChampionBetInfo(ChampionshipLogic.getBetOdds());
|
||||
ArenaRecord arenaRecord = RedisUtil.getInstence().getMapValue(RedisKey.CHAMPION_ARENA_RECORD, "", selectIdForRedis, ArenaRecord.class);
|
||||
if(proto.getType() == 0){
|
||||
int fightResult=arenaRecord.getFightResult();
|
||||
int fightResult=-1;
|
||||
|
||||
|
||||
if( ChampionshipLogic.getSchedule()==1){
|
||||
if(arenaRecord.getRoundTims() == ChampionshipLogic.getRoundTimes()&&(fightResult == -2 || !(progress % 10 == 3))){
|
||||
fightResult = -1;
|
||||
}
|
||||
}else {
|
||||
if ((realTimes+7) == arenaRecord.getRoundTims() && (fightResult == -2 || !(progress % 10 == 3))) {
|
||||
fightResult = -1;
|
||||
}
|
||||
}
|
||||
ArenaRecord thisRecord =null;
|
||||
//
|
||||
// if( ChampionshipLogic.getSchedule()==1){
|
||||
// if(arenaRecord.getRoundTims() == ChampionshipLogic.getRoundTimes()&&(fightResult == -2 || !(progress % 10 == 3))){
|
||||
// fightResult = -1;
|
||||
// }
|
||||
// }else {
|
||||
// if ((realTimes+7) == arenaRecord.getRoundTims() && (fightResult == -2 || !(progress % 10 == 3))) {
|
||||
// fightResult = -1;
|
||||
// }
|
||||
// }
|
||||
|
||||
int myGuessID = 0;
|
||||
Integer mineBetCoins = 0;
|
||||
|
@ -69,12 +74,10 @@ public class ChampionBetInfoHandler extends BaseHandler<ArenaInfoProto.ChampionG
|
|||
//
|
||||
for (String redisId:strings) {
|
||||
ArenaRecord record = RedisUtil.getInstence().getMapValue(RedisKey.CHAMPION_ARENA_RECORD, "", redisId, ArenaRecord.class);
|
||||
|
||||
if(record.getTurn()==-1){
|
||||
continue;
|
||||
}
|
||||
if(ChampionshipLogic.getFightTime()!=record.getTurn()&&record.getRoundTims()==(arenaRecord.getRoundTims())){
|
||||
|
||||
if(record.getFightResult()==-2){
|
||||
continue;
|
||||
}
|
||||
|
@ -95,10 +98,34 @@ public class ChampionBetInfoHandler extends BaseHandler<ArenaInfoProto.ChampionG
|
|||
state = record.getFightResult();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if(record.getRoundTims()==(arenaRecord.getRoundTims())){
|
||||
if(ChampionshipLogic.getSchedule()==1){
|
||||
fightResult = record.getFightResult();
|
||||
thisRecord =record;
|
||||
}else {
|
||||
if(ChampionshipLogic.getFightTime()==record.getTurn()){
|
||||
fightResult = record.getFightResult();
|
||||
thisRecord =record;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
if( ChampionshipLogic.getSchedule()==1){
|
||||
if(arenaRecord.getRoundTims() == ChampionshipLogic.getRoundTimes()&&(fightResult == -2 || !(progress % 10 == 3))){
|
||||
fightResult = -1;
|
||||
}
|
||||
}else {
|
||||
if ((realTimes+7) == arenaRecord.getRoundTims() && (fightResult == -2 || !(progress % 10 == 3))) {
|
||||
fightResult = -1;
|
||||
}
|
||||
}
|
||||
// if(state<2){
|
||||
// }else {
|
||||
// fightResult= -1;
|
||||
|
@ -109,21 +136,107 @@ public class ChampionBetInfoHandler extends BaseHandler<ArenaInfoProto.ChampionG
|
|||
myGuessID = Integer.parseInt(guessUidStr);
|
||||
mineBetCoins = RedisUtil.getInstence().getMapEntry(RedisKey.CHAMPION_BET_DETAIL, arenaRecord.getId() + ":" + guessUidStr, Integer.toString(uid), Integer.class);
|
||||
}
|
||||
CommonProto.ChampionBattleInfo.Builder builder1 = CommonProto.ChampionBattleInfo.newBuilder()
|
||||
.setMyInfo( ChampionshipLogic.getChampionBattleInfo(arenaRecord.getAttackId()))
|
||||
.setEnemyInfo( ChampionshipLogic.getChampionBattleInfo(arenaRecord.getDefUid()))
|
||||
.setResult(fightResult);
|
||||
if(fightResult!=-1){
|
||||
builder1.setFightData( CommonProto.FightData.parseFrom(arenaRecord.getFightData()));
|
||||
|
||||
|
||||
CommonProto.ChampionBattleInfo.Builder builder1 = CommonProto.ChampionBattleInfo.newBuilder();
|
||||
SArenaRobotConfig sArenaRobotConfig = SArenaRobotConfig.getsArenaRobotConfigById(arenaRecord.getAttackId());
|
||||
if (sArenaRobotConfig != null) {
|
||||
builder1.setMyInfo( PlayerLogic.getInstance().getRobotTeamInfo(sArenaRobotConfig)) ;
|
||||
}else {
|
||||
|
||||
ChampionshipLogic.MemberInfo memberInfo = RedisUtil.getInstence().getMapEntry(RedisKey.CHAMPION_JOIN, "", Integer.toString(arenaRecord.getAttackId()), ChampionshipLogic.MemberInfo.class);
|
||||
FamilyFightInfo fightInfo = memberInfo.getFightInfo();
|
||||
if(fightInfo == null){
|
||||
builder1.setMyInfo( PlayerLogic.getInstance().getUserTeamOneInfo(arenaRecord.getAttackId(), GlobalsDef.CHAMPION_TEAM));
|
||||
}else {
|
||||
//fix 整个过程都不能调整编队
|
||||
|
||||
User user = UserManager.getUser(arenaRecord.getAttackId());
|
||||
PlayerManager playerManager = user.getPlayerInfoManager();
|
||||
CommonProto.TeamOneInfo.Builder oneInfo = CommonProto.TeamOneInfo.newBuilder()
|
||||
.setHead(playerManager.getHead())
|
||||
.setHeadFrame(playerManager.getHeadFrame())
|
||||
.setLevel(playerManager.getLevel())
|
||||
.setName(playerManager.getNickName()).setUid(arenaRecord.getAttackId());
|
||||
CommonProto.TeamOneTeamInfo.Builder teamInfo = CommonProto.TeamOneTeamInfo.newBuilder();
|
||||
teamInfo.setTotalForce(fightInfo.getForce());
|
||||
if (!fightInfo.getPokenmonIds().isEmpty()) {
|
||||
teamInfo.addAllPokemonInfos(fightInfo.getPokenmonIds());
|
||||
}
|
||||
|
||||
// int i = 1;
|
||||
for (Map.Entry<String, FamilyHeroInfo> entry : fightInfo.getHeroAttribute().entrySet()) {
|
||||
FamilyHeroInfo familyHeroInfo = entry.getValue();
|
||||
teamInfo.addTeam(CommonProto.TeamSimpleInfo.newBuilder()
|
||||
.setHeroid(entry.getKey())
|
||||
.setHeroTid(familyHeroInfo.getTempleteId())
|
||||
.setStar(familyHeroInfo.getStar())
|
||||
.setLevel(familyHeroInfo.getLevel())
|
||||
.setPosition(familyHeroInfo.getPosition())
|
||||
.build()
|
||||
);
|
||||
}
|
||||
oneInfo.setTeam(teamInfo);
|
||||
builder1.setMyInfo(oneInfo);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
sArenaRobotConfig= SArenaRobotConfig.getsArenaRobotConfigById(arenaRecord.getDefUid());
|
||||
if (sArenaRobotConfig != null) {
|
||||
builder1.setEnemyInfo( PlayerLogic.getInstance().getRobotTeamInfo(sArenaRobotConfig)) ;
|
||||
}else {
|
||||
ChampionshipLogic.MemberInfo memberInfo = RedisUtil.getInstence().getMapEntry(RedisKey.CHAMPION_JOIN, "", Integer.toString(arenaRecord.getDefUid()), ChampionshipLogic.MemberInfo.class);
|
||||
FamilyFightInfo fightInfo = memberInfo.getFightInfo();
|
||||
if(fightInfo == null){
|
||||
builder1.setEnemyInfo( PlayerLogic.getInstance().getUserTeamOneInfo(arenaRecord.getDefUid(), GlobalsDef.CHAMPION_TEAM));
|
||||
}else {
|
||||
//fix 整个过程都不能调整编队
|
||||
|
||||
User user = UserManager.getUser(arenaRecord.getDefUid());
|
||||
PlayerManager playerManager = user.getPlayerInfoManager();
|
||||
CommonProto.TeamOneInfo.Builder oneInfo = CommonProto.TeamOneInfo.newBuilder()
|
||||
.setHead(playerManager.getHead())
|
||||
.setHeadFrame(playerManager.getHeadFrame())
|
||||
.setLevel(playerManager.getLevel())
|
||||
.setName(playerManager.getNickName()).setUid(arenaRecord.getDefUid());
|
||||
CommonProto.TeamOneTeamInfo.Builder teamInfo = CommonProto.TeamOneTeamInfo.newBuilder();
|
||||
teamInfo.setTotalForce(fightInfo.getForce());
|
||||
if (!fightInfo.getPokenmonIds().isEmpty()) {
|
||||
teamInfo.addAllPokemonInfos(fightInfo.getPokenmonIds());
|
||||
}
|
||||
|
||||
// int i = 1;
|
||||
for (Map.Entry<String, FamilyHeroInfo> entry : fightInfo.getHeroAttribute().entrySet()) {
|
||||
FamilyHeroInfo familyHeroInfo = entry.getValue();
|
||||
teamInfo.addTeam(CommonProto.TeamSimpleInfo.newBuilder()
|
||||
.setHeroid(entry.getKey())
|
||||
.setHeroTid(familyHeroInfo.getTempleteId())
|
||||
.setStar(familyHeroInfo.getStar())
|
||||
.setLevel(familyHeroInfo.getLevel())
|
||||
.setPosition(familyHeroInfo.getPosition())
|
||||
.build()
|
||||
);
|
||||
}
|
||||
oneInfo.setTeam(teamInfo);
|
||||
builder1.setEnemyInfo(oneInfo);
|
||||
}
|
||||
}
|
||||
builder1.setResult(fightResult);
|
||||
if(thisRecord!=null&&thisRecord.getFightData()!=null){
|
||||
CommonProto.FightData fightDataProto = CommonProto.FightData.parseFrom(thisRecord.getFightData());
|
||||
builder1.setFightData(fightDataProto);
|
||||
}
|
||||
|
||||
builder.setProcess(state);
|
||||
builder.setChampionBattleInfo(builder1
|
||||
.build());
|
||||
builder.setWinUid(myGuessID);
|
||||
builder.setMyBetCoins(mineBetCoins);
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.CHAMPION_BET_INFO_RESPONSE_VALUE,builder.build(),true);
|
||||
|
|
|
@ -873,6 +873,7 @@ public class ChampionshipLogic {
|
|||
arenaRecord.setAttackId(attackUid);
|
||||
arenaRecord.setDefUid(defUid);
|
||||
arenaRecord.setType(type);
|
||||
arenaRecord.setTurn(ChampionshipLogic.fightTime);
|
||||
arenaRecord.setRoundTims(roundTimes);
|
||||
arenaRecordMap.put(arenaRecord.getId(), arenaRecord);
|
||||
}
|
||||
|
@ -1143,11 +1144,15 @@ public class ChampionshipLogic {
|
|||
|
||||
public static void minuteCheck(boolean isServerStart) throws Exception {
|
||||
TimeControllerOfFunction timeControllerOfFunction = GlobalDataManaager.getInstance().getTimeControllerOfFunctionByFunctinoType(FunctionIdEnum.TopBattle);
|
||||
|
||||
if (null == timeControllerOfFunction) {
|
||||
progress = -1;
|
||||
return;
|
||||
}
|
||||
|
||||
Map<Integer, MemberInfo> joinMembers = RedisUtil.getInstence().getMapValues(RedisKey.CHAMPION_JOIN, "", Integer.class, MemberInfo.class);
|
||||
if(joinMembers.size()==0){
|
||||
return;
|
||||
}
|
||||
if(progress == -2){
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -701,7 +701,7 @@ public class PlayerManager extends MongoBase {
|
|||
|
||||
public void setMaxforceHero(String maxforceHero) {
|
||||
this.maxforceHero = maxforceHero;
|
||||
updateString("maxforceHero",maxforceHero);
|
||||
updateString("maxforceHero",this.maxforceHero);
|
||||
}
|
||||
|
||||
public Set<Integer> getProudInfo() {
|
||||
|
|
Loading…
Reference in New Issue