Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn

back_recharge
jiahuiwen 2021-11-08 17:51:43 +08:00
commit c9eff64beb
5 changed files with 16 additions and 25 deletions

View File

@ -30,19 +30,6 @@ import java.util.stream.Collectors;
public class CoreService implements RPCRequestIFace.Iface {
private static final Logger LOGGER = LoggerFactory.getLogger(CoreService.class);
/**
*
*/
private CoreService(){
}
public static class Instance {
private final static CoreService INSTANCE = new CoreService();
}
public static CoreService getInstance() {
return CoreService.Instance.INSTANCE;
}
@Override
public Result deliveryRecharge(int uid, String goodsId, String openId, String orderId, long orderTime, int amount) {
try {

View File

@ -149,18 +149,19 @@ public class GetWorldArenaChallengeRequestHandler extends BaseHandler<WorldProto
if(Integer.parseInt(value)!=proto.getChallengeUid()){
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
}
int defendForce;
if (proto.getChallengeUid()>1000) {
CSPlayer csPlayer = CrossServiceLogic.getPlayerByRedis(proto.getChallengeUid());
if (csPlayer == null){
throw new ErrorCodeException(ErrorCode.USE_NOT_EXIT);
}
CrossArenaManager crossArenaManager = PlayerLogic.getInstance().getCrossArenaManagerData(csPlayer);
CrossArenaManager crossArenaManager = null;
if (csPlayer.getServerId() != GameApplication.serverId){
crossArenaManager = PlayerLogic.getInstance().getCrossArenaManagerData(csPlayer);
}
teamInfo = FightUtil.makeCrossPersonData(csPlayer, proto.getTeamId(), null, crossArenaManager);
arenaEnemys = ArenaLogic.getInstance().getUserCrossArenaEnemy(csPlayer,proto.getChallengeRank(),false).build();
defendForce = crossArenaManager.getTotalForceByTeam().get(proto.getTeamId());
defendForce = (int) CrossServiceLogic.getCrossTeamForce(csPlayer.getUserId(),proto.getTeamId());
} else {
//机器人
CrossArenaEnemy info = RedisUtil.getInstence().getMapEntry(RedisKey.CROSS_ARENA_ROBOT_INFO, String.valueOf(crossGroup), String.valueOf(proto.getChallengeUid()), CrossArenaEnemy.class);

View File

@ -1,6 +1,7 @@
package com.ljsd.jieling.logic.arena;
import com.google.gson.reflect.TypeToken;
import com.ljsd.GameApplication;
import com.ljsd.fight.ArenaRecord;
import com.ljsd.fight.FightType;
import com.ljsd.jieling.config.clazzStaticCfg.SArenaRobotStaticConfig;
@ -660,10 +661,13 @@ public class ArenaLogic {
User mine = UserManager.getUser(session.getUid());
int myforce = HeroLogic.getInstance().calTeamTotalForce(mine, myteamId, false);
CommonProto.FightTeamInfo fightTeamInfo = BehaviorUtil.getFightTeamInfo(mine,myteamId,true);
CommonProto.FightTeamInfo deffightTeamInfo = null;
CommonProto.FightTeamInfo deffightTeamInfo;
int deforce;
if(cross==0){
User defUser = UserManager.getUser(challengeUid);
User defUser = UserManager.getUserNotCache(challengeUid);
if (defUser == null){
throw new ErrorCodeException(ErrorCode.USE_NOT_EXIT);
}
if(!defUser.getTeamPosManager().getTeamPosForHero().containsKey(1)){
throw new ErrorCodeException(ErrorCode.newDefineCode("对方未设置阵容"));
}
@ -677,7 +681,10 @@ public class ArenaLogic {
throw new ErrorCodeException(ErrorCode.newDefineCode("当前玩家没有跨服数据"));
}
deforce = 0;
CrossArenaManager crossArenaManager = PlayerLogic.getInstance().getCrossArenaManagerData(csPlayer);
CrossArenaManager crossArenaManager = null;
if (csPlayer.getServerId() != GameApplication.serverId){
crossArenaManager = PlayerLogic.getInstance().getCrossArenaManagerData(csPlayer);
}
deffightTeamInfo = FightUtil.makeCrossPersonData(csPlayer, myteamId, null, crossArenaManager);
}
if(myforce<deforce){

View File

@ -973,10 +973,6 @@ public class PlayerLogic {
* @return
*/
public CrossArenaManager getCrossArenaManagerData(CSPlayer csPlayer){
// 本服玩家数据
if (csPlayer.getServerId() == GameApplication.serverId){
return CoreService.getInstance().getHeroManagerInfo(csPlayer.getUserId());
}
String rpcString = RedisUtil.getInstence().getObject(RedisKey.LOGIC_SERVER_INFO, String.valueOf(csPlayer.getServerId()), String.class, -1);
String[] split = rpcString.split(":");

View File

@ -39,7 +39,7 @@ public class RPCServerTask extends Thread{
TServerSocket serverTransport = new TServerSocket(new InetSocketAddress(coreSettings.getIp(), coreSettings.getPort()));
LOGGER.info("run->coreip={},corePort={}", coreSettings.getIp(), coreSettings.getPort());
TThreadPoolServer.Args trArgs = new TThreadPoolServer.Args(serverTransport);
TProcessor processor = new RPCRequestIFace.Processor(CoreService.getInstance());
TProcessor processor = new RPCRequestIFace.Processor(new CoreService());
trArgs.processor(processor);
TBinaryProtocol.Factory proFactory = new TBinaryProtocol.Factory(true, true);
trArgs.protocolFactory(proFactory);