Merge branch 'master' into master_test
commit
0f336e3bd1
|
|
@ -74,6 +74,12 @@ public class ChampionBetInfoHandler extends BaseHandler<ArenaInfoProto.ChampionG
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if((!record.getId().equals(arenaRecord.getId()))&&record.getRoundTims()==(arenaRecord.getRoundTims())){
|
if((!record.getId().equals(arenaRecord.getId()))&&record.getRoundTims()==(arenaRecord.getRoundTims())){
|
||||||
|
|
||||||
|
if(record.getFightResult()==-2){
|
||||||
|
// System.out.println(record.getAttackId()+"vvvvvvvvvvvvvv = " +record.getDefUid()+"turn"+ record.getId()+"RoundTims()"+record.getRoundTims()+"turn"+record.getTurn()+"fight"+record.getFightResult()+"state"+state);
|
||||||
|
// System.out.println(arenaRecord.getAttackId()+"vvvvvvvvvvvvvv = "+record.getDefUid()+"turn" + arenaRecord.getId()+"RoundTims()"+arenaRecord.getRoundTims()+"turn"+arenaRecord.getTurn()+"fight"+arenaRecord.getFightResult()+"state"+state);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
if (record.getFightResult() == 1) {
|
if (record.getFightResult() == 1) {
|
||||||
if (state == -1) {
|
if (state == -1) {
|
||||||
state = 2;
|
state = 2;
|
||||||
|
|
@ -91,6 +97,8 @@ public class ChampionBetInfoHandler extends BaseHandler<ArenaInfoProto.ChampionG
|
||||||
state = record.getFightResult();
|
state = record.getFightResult();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// System.out.println("vvvvvvvvvvvvvv22ccc = " +record.getDefUid()+"turn"+ record.getId()+"RoundTims()"+record.getRoundTims()+"turn"+record.getTurn()+"fight"+record.getFightResult()+"state"+state);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -75,7 +75,6 @@ public class ChampionViewFinalHandler extends BaseHandler<ArenaInfoProto.Champio
|
||||||
int attackId = arenaRecord.getAttackId();
|
int attackId = arenaRecord.getAttackId();
|
||||||
int defUid = arenaRecord.getDefUid();
|
int defUid = arenaRecord.getDefUid();
|
||||||
|
|
||||||
System.out.println("attackId = " + attackId+"defUid = " + defUid);
|
|
||||||
int fightResult = arenaRecord.getFightResult();
|
int fightResult = arenaRecord.getFightResult();
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -137,7 +137,7 @@ public class ReportUtil {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void saveBaseInfo(int uid,PlayerInfoProto.LoginRequest loginRequest){
|
public static void saveBaseInfo(int uid,PlayerInfoProto.LoginRequest loginRequest){
|
||||||
ReportBaseBean reportBaseBean = new ReportBaseBean(loginRequest.getOpenId(),loginRequest.getDistinctId(),loginRequest.getDeviceIdS(),loginRequest.getIpS(),0);
|
ReportBaseBean reportBaseBean = new ReportBaseBean(String.valueOf(uid),loginRequest.getDistinctId(),loginRequest.getDeviceIdS(),loginRequest.getIpS(),0);
|
||||||
baseBeanMap.put(uid,reportBaseBean);
|
baseBeanMap.put(uid,reportBaseBean);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -891,7 +891,6 @@ public class ChampionshipLogic {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
System.out.println("vvvvvvvvvvvvvvpossibleJoin = " + possibleJoin.size());
|
|
||||||
Map<Integer, Integer> memberPerOfTeam = new HashMap<>();
|
Map<Integer, Integer> memberPerOfTeam = new HashMap<>();
|
||||||
finalmemberOfTeam.forEach((k, v) -> {
|
finalmemberOfTeam.forEach((k, v) -> {
|
||||||
v.forEach(memberId -> {
|
v.forEach(memberId -> {
|
||||||
|
|
@ -923,7 +922,6 @@ public class ChampionshipLogic {
|
||||||
} else {
|
} else {
|
||||||
arenaRecord.setNums(times++ % length);
|
arenaRecord.setNums(times++ % length);
|
||||||
}
|
}
|
||||||
LOGGER.info("sseccccccccccccccccccccthe attackId={},the defid={},the rountTImes={},the team={},the position={}", attackUid, defUid, roundTimes, memberPerOfTeam.get(attackUid), arenaRecord.getNums());
|
|
||||||
arenaRecordMap.put(arenaRecord.getId(), arenaRecord);
|
arenaRecordMap.put(arenaRecord.getId(), arenaRecord);
|
||||||
}catch (Exception e){
|
}catch (Exception e){
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@ public class AreFightPro implements EndFightProcessor {
|
||||||
@Override
|
@Override
|
||||||
public void endfightProcess(FightResult fightResult) {
|
public void endfightProcess(FightResult fightResult) {
|
||||||
int result = fightResult.getCheckResult()[0];
|
int result = fightResult.getCheckResult()[0];
|
||||||
|
|
||||||
arenaRecord.setFightResult(fightResult.getCheckResult()[0]);
|
arenaRecord.setFightResult(fightResult.getCheckResult()[0]);
|
||||||
|
|
||||||
if(ChampionshipLogic.getSchedule()==2){
|
if(ChampionshipLogic.getSchedule()==2){
|
||||||
|
|
@ -46,7 +47,6 @@ public class AreFightPro implements EndFightProcessor {
|
||||||
}else{
|
}else{
|
||||||
state=result;}
|
state=result;}
|
||||||
}
|
}
|
||||||
System.out.println("keykeykeykeykeykeykey"+key+": "+arenaRecord.getId()+": "+arenaRecord.getTurn()+" : "+arenaRecord.getAttackId()+"AreFightPro state = " + state);
|
|
||||||
RedisUtil.getInstence().putMapEntry(RedisKey.CHAMPION_ARENA_RECORD_THREE,"",key,state);
|
RedisUtil.getInstence().putMapEntry(RedisKey.CHAMPION_ARENA_RECORD_THREE,"",key,state);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -359,7 +359,7 @@ public class BuyGoodsLogic {
|
||||||
sendGiftGooodsIndication(uid);
|
sendGiftGooodsIndication(uid);
|
||||||
onChargeSuccess(uid,sRechargeCommodityConfig.getPrice(),0,orderId);//充值成功上报
|
onChargeSuccess(uid,sRechargeCommodityConfig.getPrice(),0,orderId);//充值成功上报
|
||||||
Map<Integer, Integer> mapReward = ItemUtil.arrayToMap(baseReward);
|
Map<Integer, Integer> mapReward = ItemUtil.arrayToMap(baseReward);
|
||||||
ReportUtil.onReportEvent(user, ReportEventEnum.ORDER_COMPLETE.getType(),orderId,price,user.getPlayerInfoManager().getBundle_id(),user.getPlayerInfoManager().getChannel_id(),String.valueOf(GameApplication.serverId),String.valueOf(goodsId),sRechargeCommodityConfig.getName(),mapReward.keySet(),mapReward.values());
|
ReportUtil.onReportEvent(user, ReportEventEnum.ORDER_COMPLETE.getType(),orderId,price,user.getPlayerInfoManager().getBundle_id(),user.getPlayerInfoManager().getChannel_id(),String.valueOf(GameApplication.serverId),String.valueOf(goodsId),sRechargeCommodityConfig.getName(),new ArrayList<>(mapReward.keySet()),new ArrayList<>(mapReward.values()));
|
||||||
return resultRes;
|
return resultRes;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue