Merge branch 'master' into master_test
commit
238f0ce657
|
@ -67,7 +67,7 @@ public class GameApplication {
|
|||
String cmd = sc.nextLine();
|
||||
if(cmd.startsWith("//"))
|
||||
{
|
||||
System.out.println("执行命令:" + cmd.substring(2));
|
||||
System.out.println("gmgmgm:" + cmd.substring(2));
|
||||
String cmd2 = cmd.substring(2);
|
||||
GmService.exeCmd(cmd2);
|
||||
}
|
||||
|
|
|
@ -79,7 +79,10 @@ public class ChampinGetHandler extends BaseHandler {
|
|||
int state = -1;
|
||||
for (String redisId : strings) {
|
||||
ArenaRecord record = RedisUtil.getInstence().getMapValue(RedisKey.CHAMPION_ARENA_RECORD, "", redisId, ArenaRecord.class);
|
||||
if ((!record.getId().equals(arenaRecord.getId())) && record.getRoundTims() == roundTims) {
|
||||
if(record.getTurn()==-1){
|
||||
continue;
|
||||
}
|
||||
if(ChampionshipLogic.getFightTime()!=record.getTurn()&&record.getRoundTims()==(arenaRecord.getRoundTims())){
|
||||
if (record.getFightResult() == 1) {
|
||||
if (state == -1) {
|
||||
state = 2;
|
||||
|
|
|
@ -73,7 +73,7 @@ public class ChampionBetInfoHandler extends BaseHandler<ArenaInfoProto.ChampionG
|
|||
if(record.getTurn()==-1){
|
||||
continue;
|
||||
}
|
||||
if((!record.getId().equals(arenaRecord.getId()))&&record.getRoundTims()==(arenaRecord.getRoundTims())){
|
||||
if(ChampionshipLogic.getFightTime()!=record.getTurn()&&record.getRoundTims()==(arenaRecord.getRoundTims())){
|
||||
|
||||
if(record.getFightResult()==-2){
|
||||
continue;
|
||||
|
@ -96,7 +96,6 @@ public class ChampionBetInfoHandler extends BaseHandler<ArenaInfoProto.ChampionG
|
|||
}
|
||||
}
|
||||
|
||||
// System.out.println("vvvvvvvvvvvvvv22ccc = " +record.getDefUid()+"turn"+ record.getId()+"RoundTims()"+record.getRoundTims()+"turn"+record.getTurn()+"fight"+record.getFightResult()+"state"+state);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -225,7 +225,6 @@ public class ChampionshipLogic {
|
|||
|
||||
int score ;
|
||||
if (schedule == 2) {
|
||||
|
||||
joinMemberInfo.setFinalScore(joinMemberInfo.getFinalScore() + 1);
|
||||
MemberInfo failMemberInfo = getJoinMemberInfo(failerUid);
|
||||
failMemberInfo.setFinalScore(joinMemberInfo.getFinalScore() * -1);
|
||||
|
@ -234,8 +233,8 @@ public class ChampionshipLogic {
|
|||
score = joinMemberInfo.getFinalScore();
|
||||
finalArenaIds.add(v.getId());
|
||||
}else {
|
||||
score = joinMemberInfo.getScore();
|
||||
joinMemberInfo.setScore(joinMemberInfo.getScore() + 1);
|
||||
score = joinMemberInfo.getScore();
|
||||
updateJoinMemberInfo(joinMemberInfo);
|
||||
}
|
||||
integerIntegerHashMap.putIfAbsent(winnerUid,new DefaultTypedTuple(Integer.toString(winnerUid), (double) score));
|
||||
|
|
|
@ -90,7 +90,6 @@ public class UserManager {
|
|||
|
||||
private static User registerUser(int uid,String openId,String channel,int pid,int gid,String platform,String ip,String channle_id,String bundle_id) throws Exception {
|
||||
User user = new User(uid);
|
||||
ReportUtil.onReportEvent(user, ReportEventEnum.CREATE_ROLE.getType());//先发送注册事件
|
||||
UserManager.addUser(user);
|
||||
initPlayer(user,openId,channel,pid,gid,platform,ip,channle_id,bundle_id);
|
||||
MongoUtil.getInstence().getMyMongoTemplate().save(user);
|
||||
|
@ -139,6 +138,7 @@ public class UserManager {
|
|||
user.getUserMissionManager().onGameEvent(user, GameEvent.BEGINNER);
|
||||
user.getUserMissionManager().onGameEvent(user, GameEvent.VIP_LEVLUP,0);
|
||||
Poster.getPoster().dispatchEvent(new NewWelfareEvent(user, NewWelfareTypeEnum.LOGIN_TIMES.getType(),1));
|
||||
ReportUtil.onReportEvent(user, ReportEventEnum.CREATE_ROLE.getType());//先发送注册事件
|
||||
ItemUtil.drop(user,gameSetting.getBornItem(), BIReason.USER_BORN_REWARD);
|
||||
HeroManager heroManager = user.getHeroManager();
|
||||
Map<String, Hero> heroMap = heroManager.getHeroMap();
|
||||
|
|
Loading…
Reference in New Issue